UnityMirror/spine-runtimes
1
0
Fork 0
mirror of https://github.com/EsotericSoftware/spine-runtimes.git synced 2026-03-25 22:23:42 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '4.0' into 4.1-beta

Browse Source
This commit is contained in:
Harald Csaszar 2022-06-27 14:06:22 +02:00
commit 845cc33895
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
spine-unity/Assets/Spine/Editor/spine-unity/Editor/Components/SkeletonGraphicInspector.cs
View File

@ -60,7 +60,7 @@ namespace Spine.Unity.Editor {
SerializedProperty initialFlipX, initialFlipY; SerializedProperty initialFlipX, initialFlipY;
SerializedProperty meshGeneratorSettings; SerializedProperty meshGeneratorSettings;
SerializedProperty allowMultipleCanvasRenderers, separatorSlotNames, enableSeparatorSlots, updateSeparatorPartLocation; SerializedProperty allowMultipleCanvasRenderers, separatorSlotNames, enableSeparatorSlots, updateSeparatorPartLocation;
SerializedProperty raycastTarget; SerializedProperty raycastTarget, maskable;
readonly GUIContent UnscaledTimeLabel = new GUIContent("Unscaled Time", readonly GUIContent UnscaledTimeLabel = new GUIContent("Unscaled Time",
"If enabled, AnimationState uses unscaled game time (Time.unscaledDeltaTime), " + "If enabled, AnimationState uses unscaled game time (Time.unscaledDeltaTime), " +
@ -107,6 +107,7 @@ namespace Spine.Unity.Editor {
material = so.FindProperty("m_Material"); material = so.FindProperty("m_Material");
color = so.FindProperty("m_Color"); color = so.FindProperty("m_Color");
raycastTarget = so.FindProperty("m_RaycastTarget"); raycastTarget = so.FindProperty("m_RaycastTarget");
maskable = so.FindProperty("m_Maskable");
// SkeletonRenderer // SkeletonRenderer
additiveMaterial = so.FindProperty("additiveMaterial"); additiveMaterial = so.FindProperty("additiveMaterial");
@ -295,6 +296,7 @@ namespace Spine.Unity.Editor {
EditorGUILayout.Space(); EditorGUILayout.Space();
EditorGUILayout.LabelField("UI", EditorStyles.boldLabel); EditorGUILayout.LabelField("UI", EditorStyles.boldLabel);
EditorGUILayout.PropertyField(raycastTarget); EditorGUILayout.PropertyField(raycastTarget);
if (maskable != null) EditorGUILayout.PropertyField(maskable);
EditorGUILayout.BeginHorizontal(GUILayout.Height(EditorGUIUtility.singleLineHeight + 5)); EditorGUILayout.BeginHorizontal(GUILayout.Height(EditorGUIUtility.singleLineHeight + 5));
EditorGUILayout.PrefixLabel("Match RectTransform with Mesh"); EditorGUILayout.PrefixLabel("Match RectTransform with Mesh");