diff --git a/Source/Editor/CustomEditors/Editors/ActorTransformEditor.cs b/Source/Editor/CustomEditors/Editors/ActorTransformEditor.cs index 79c08a596..ac520fd7a 100644 --- a/Source/Editor/CustomEditors/Editors/ActorTransformEditor.cs +++ b/Source/Editor/CustomEditors/Editors/ActorTransformEditor.cs @@ -86,14 +86,14 @@ namespace FlaxEditor.CustomEditors.Editors { base.Initialize(layout); - LinkValuesTogether = Editor.Instance.Windows.PropertiesWin.ScaleLocked; + LinkValues = Editor.Instance.Windows.PropertiesWin.ScaleLinked; _linkImage = new Image { Parent = LinkedLabel, Width = 18, Height = 18, - Brush = LinkValuesTogether ? new SpriteBrush(Editor.Instance.Icons.Link32) : new SpriteBrush(), + Brush = LinkValues ? new SpriteBrush(Editor.Instance.Icons.Link32) : new SpriteBrush(), AnchorPreset = AnchorPresets.TopLeft, TooltipText = "Scale values are linked together.", }; @@ -103,7 +103,7 @@ namespace FlaxEditor.CustomEditors.Editors LinkedLabel.SetupContextMenu += (label, menu, editor) => { menu.AddSeparator(); - menu.AddButton(LinkValuesTogether ? "Unlink" : "Link", ToggleLink); + menu.AddButton(LinkValues ? "Unlink" : "Link", ToggleLink); }; // Override colors @@ -122,9 +122,9 @@ namespace FlaxEditor.CustomEditors.Editors /// public void ToggleLink() { - LinkValuesTogether = !LinkValuesTogether; - Editor.Instance.Windows.PropertiesWin.ScaleLocked = LinkValuesTogether; - _linkImage.Brush = LinkValuesTogether ? new SpriteBrush(Editor.Instance.Icons.Link32) : new SpriteBrush(); + LinkValues = !LinkValues; + Editor.Instance.Windows.PropertiesWin.ScaleLinked = LinkValues; + _linkImage.Brush = LinkValues ? new SpriteBrush(Editor.Instance.Icons.Link32) : new SpriteBrush(); } } } diff --git a/Source/Editor/CustomEditors/Editors/Vector3Editor.cs b/Source/Editor/CustomEditors/Editors/Vector3Editor.cs index ffdcfb825..ad67a4b13 100644 --- a/Source/Editor/CustomEditors/Editors/Vector3Editor.cs +++ b/Source/Editor/CustomEditors/Editors/Vector3Editor.cs @@ -47,7 +47,7 @@ namespace FlaxEditor.CustomEditors.Editors /// /// If true, when one value is changed, the other 2 will change as well. /// - public bool LinkValuesTogether = false; + public bool LinkValues = false; private enum ValueChanged { @@ -95,7 +95,7 @@ namespace FlaxEditor.CustomEditors.Editors { if (IsSetBlocked) return; - if (LinkValuesTogether) + if (LinkValues) _valueChanged = ValueChanged.X; OnValueChanged(); @@ -105,7 +105,7 @@ namespace FlaxEditor.CustomEditors.Editors { if (IsSetBlocked) return; - if (LinkValuesTogether) + if (LinkValues) _valueChanged = ValueChanged.Y; OnValueChanged(); @@ -115,7 +115,7 @@ namespace FlaxEditor.CustomEditors.Editors { if (IsSetBlocked) return; - if (LinkValuesTogether) + if (LinkValues) _valueChanged = ValueChanged.Z; OnValueChanged(); @@ -130,7 +130,7 @@ namespace FlaxEditor.CustomEditors.Editors var yValue = YElement.ValueBox.Value; var zValue = ZElement.ValueBox.Value; - if (LinkValuesTogether) + if (LinkValues) { var valueChange = 0.0f; switch (_valueChanged) diff --git a/Source/Editor/Windows/PropertiesWindow.cs b/Source/Editor/Windows/PropertiesWindow.cs index 21c7d0faf..601717f38 100644 --- a/Source/Editor/Windows/PropertiesWindow.cs +++ b/Source/Editor/Windows/PropertiesWindow.cs @@ -28,7 +28,7 @@ namespace FlaxEditor.Windows /// /// Indication of if the scale is locked. /// - public bool ScaleLocked = false; + public bool ScaleLinked = false; /// /// Initializes a new instance of the class. @@ -65,14 +65,14 @@ namespace FlaxEditor.Windows /// public override void OnLayoutSerialize(XmlWriter writer) { - writer.WriteAttributeString("ScaleLocked", ScaleLocked.ToString()); + writer.WriteAttributeString("ScaleLinked", ScaleLinked.ToString()); } /// public override void OnLayoutDeserialize(XmlElement node) { - if (bool.TryParse(node.GetAttribute("ScaleLocked"), out bool value1)) - ScaleLocked = value1; + if (bool.TryParse(node.GetAttribute("ScaleLinked"), out bool value1)) + ScaleLinked = value1; } } }