feat: the Sampling Scale property should remain unchanged when loading a preset

mob-sakai · mob-sakai · commit 238a17d57ddf · 2025-01-07T17:23:22.000+09:00
close #292
diff --git a/Packages/src/Editor/UIEffectEditor.cs b/Packages/src/Editor/UIEffectEditor.cs
@@ -80,7 +80,7 @@ public class UIEffect2Editor : Editor
         private SerializedProperty _gradationScale;
         private SerializedProperty _gradationRotation;
 
-        private bool _expandOthers;
+        private bool _expandOthers = true;
         private SerializedProperty _allowToModifyMeshShape;
 
         private void OnEnable()
@@ -186,7 +186,6 @@ public void DrawProperties()
             {
                 EditorGUI.indentLevel++;
                 EditorGUILayout.PropertyField(_samplingIntensity);
-                EditorGUILayout.PropertyField(_samplingScale);
                 EditorGUI.indentLevel--;
             }
 
@@ -334,6 +333,7 @@ public void DrawProperties()
             _expandOthers = EditorGUILayout.BeginFoldoutHeaderGroup(_expandOthers, "Others");
             if (_expandOthers)
             {
+                EditorGUILayout.PropertyField(_samplingScale);
                 EditorGUILayout.PropertyField(_allowToModifyMeshShape);
             }
         }
diff --git a/Packages/src/Runtime/UIEffect.cs b/Packages/src/Runtime/UIEffect.cs
@@ -919,7 +919,6 @@ public void LoadPreset(UIEffect preset)
 
             m_SamplingFilter = preset.m_SamplingFilter;
             m_SamplingIntensity = preset.m_SamplingIntensity;
-            m_SamplingScale = preset.m_SamplingScale;
 
             m_TransitionFilter = preset.m_TransitionFilter;
             m_TransitionRate = preset.m_TransitionRate;

Original file line number	Diff line number	Diff line change
`@@ -80,7 +80,7 @@ public class UIEffect2Editor : Editor`
`80`	`80`	`private SerializedProperty _gradationScale;`
`81`	`81`	`private SerializedProperty _gradationRotation;`
`82`	`82`
`83`		`- private bool _expandOthers;`
	`83`	`+ private bool _expandOthers = true;`
`84`	`84`	`private SerializedProperty _allowToModifyMeshShape;`
`85`	`85`
`86`	`86`	`private void OnEnable()`
`@@ -186,7 +186,6 @@ public void DrawProperties()`
`186`	`186`	`{`
`187`	`187`	`EditorGUI.indentLevel++;`
`188`	`188`	`EditorGUILayout.PropertyField(_samplingIntensity);`
`189`		`- EditorGUILayout.PropertyField(_samplingScale);`
`190`	`189`	`EditorGUI.indentLevel--;`
`191`	`190`	`}`
`192`	`191`
`@@ -334,6 +333,7 @@ public void DrawProperties()`
`334`	`333`	`_expandOthers = EditorGUILayout.BeginFoldoutHeaderGroup(_expandOthers, "Others");`
`335`	`334`	`if (_expandOthers)`
`336`	`335`	`{`
	`336`	`+ EditorGUILayout.PropertyField(_samplingScale);`
`337`	`337`	`EditorGUILayout.PropertyField(_allowToModifyMeshShape);`
`338`	`338`	`}`
`339`	`339`	`}`