Skip to content
This repository was archived by the owner on Nov 30, 2020. It is now read-only.

Commit 98d22c2

Browse files
committed
Fixed 'enabled' override state on volumes
1 parent 2a0e7c5 commit 98d22c2

File tree

4 files changed

+4
-8
lines changed

4 files changed

+4
-8
lines changed

PostProcessing/Editor/EffectListEditor.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -302,7 +302,6 @@ PostProcessEffectSettings CreateNewEffect(Type type)
302302
var effect = (PostProcessEffectSettings)ScriptableObject.CreateInstance(type);
303303
effect.hideFlags = HideFlags.HideInInspector | HideFlags.HideInHierarchy;
304304
effect.name = type.Name;
305-
effect.enabled.overrideState = true;
306305
effect.enabled.value = true;
307306
return effect;
308307
}

PostProcessing/Editor/PostProcessEffectBaseEditor.cs

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ internal void Init(PostProcessEffectSettings target, Editor inspector)
2929
this.target = target;
3030
m_Inspector = inspector;
3131
serializedObject = new SerializedObject(target);
32-
m_Enabled = serializedObject.FindProperty("enabled");
32+
m_Enabled = serializedObject.FindProperty("enabled.value");
3333
activeProperty = serializedObject.FindProperty("active");
3434
OnEnable();
3535
}
@@ -72,12 +72,10 @@ void TopRowFields()
7272

7373
GUILayout.FlexibleSpace();
7474

75-
var property = m_Enabled.Copy();
76-
property.Next(true);
77-
bool enabled = property.boolValue;
75+
bool enabled = m_Enabled.boolValue;
7876
enabled = GUILayout.Toggle(enabled, EditorUtilities.GetContent("On|Enable this effect."), EditorStyles.miniButtonLeft, GUILayout.Width(35f), GUILayout.ExpandWidth(false));
7977
enabled = !GUILayout.Toggle(!enabled, EditorUtilities.GetContent("Off|Disable this effect."), EditorStyles.miniButtonRight, GUILayout.Width(35f), GUILayout.ExpandWidth(false));
80-
property.boolValue = enabled;
78+
m_Enabled.boolValue = enabled;
8179
}
8280
}
8381

PostProcessing/Runtime/PostProcessEffectSettings.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ public class PostProcessEffectSettings : ScriptableObject
1414

1515
// This is the true state of the effect override in the stack - so you can disable a lower
1616
// priority effect by pushing a higher priority effect with enabled set to false.
17-
public BoolParameter enabled = new BoolParameter { value = false };
17+
public BoolParameter enabled = new BoolParameter { overrideState = true, value = false };
1818

1919
internal ReadOnlyCollection<ParameterOverride> parameters;
2020

PostProcessing/Runtime/PostProcessProfile.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@ public PostProcessEffectSettings AddSettings(Type type)
3131
var effect = (PostProcessEffectSettings)CreateInstance(type);
3232
effect.hideFlags = HideFlags.HideInInspector | HideFlags.HideInHierarchy;
3333
effect.name = type.Name;
34-
effect.enabled.overrideState = true;
3534
effect.enabled.value = true;
3635
settings.Add(effect);
3736
isDirty = true;

0 commit comments

Comments
 (0)