AnimeFunsion/modular-avatar
1
0
Fork 0
mirror of https://github.com/bdunderscore/modular-avatar.git synced 2025-01-17 11:50:11 +08:00
Code Issues Packages Projects Releases Wiki Activity

[ui] prevent Setup Outfit from running on an avatar root (#121)

Browse Source 
Closes: #118
This commit is contained in:
bd_ 2022-11-30 12:49:21 -08:00 committed by GitHub
parent 2530588fe0
commit 55e363c1b2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
Packages/nadena.dev.modular-avatar/Editor/EasySetupOutfit.cs
View File

@ -1,4 +1,5 @@
using UnityEditor; using System.Text;
using UnityEditor;
using UnityEngine; using UnityEngine;
namespace nadena.dev.modular_avatar.core.editor namespace nadena.dev.modular_avatar.core.editor
@ -28,11 +29,24 @@ namespace nadena.dev.modular_avatar.core.editor
{ {
foreach (var obj in Selection.objects) foreach (var obj in Selection.objects)
{ {
if (!(obj is GameObject gameObj)) return false;
var xform = gameObj.transform;
if (!FindBones(obj, out var _, out var _, out var outfitHips) if (!FindBones(obj, out var _, out var _, out var outfitHips)
|| outfitHips.transform.parent.GetComponent<ModularAvatarMergeArmature>() != null) || outfitHips.transform.parent.GetComponent<ModularAvatarMergeArmature>() != null)
{ {
return false; return false;
} }
// Some users have been accidentally running Setup Outfit on the avatar itself, and/or nesting avatar
// descriptors when transplanting outfits. Block this (and require that there be only one avdesc) by
// refusing to run if we detect multiple avatar descriptors above the current object (or if we're run on
// the avdesc object itself)
var nearestAvatar = RuntimeUtil.FindAvatarInParents(xform);
if (nearestAvatar == null || nearestAvatar.transform == xform) return false;
var parent = nearestAvatar.transform.parent;
if (parent != null && RuntimeUtil.FindAvatarInParents(parent) != null) return false;
} }
return true; return true;