Merge pull request #1675 from Azaezel/alpha41/oneVarToHoldThemAll

bind grid snapping bool to one variable

Author: Azaezel

Templates/BaseGame/game/tools/convexEditor/convexEditorGui.tscript

@@ -60,10 +60,10 @@ function ConvexEditorGui::onWake( %this )
       %this.releaseSidePanel();
    }
 
-   EWorldEditor.UseGridSnap = EditorSettings.value("WorldEditor/Tools/UseGridSnap");
-   CESnapOptions-->objectGridSnapBtn.setStateOn( EWorldEditor.UseGridSnap );
-   %this.setGridSnap( EWorldEditor.UseGridSnap );
-   EWorldEditor.setGridSnap( EWorldEditor.UseGridSnap );
+   EWorldEditor.gridSnap = EditorSettings.value("WorldEditor/Tools/gridSnap");
+   CESnapOptions-->objectGridSnapBtn.setStateOn( EWorldEditor.gridSnap );
+   %this.setGridSnap( EWorldEditor.gridSnap );
+   EWorldEditor.setGridSnap( EWorldEditor.gridSnap );
 }
 
 function ConvexEditorGui::onSleep( %this )
@@ -217,11 +217,11 @@ function ConvexEditorMaterialResetBtn::onClick(%this)
 
 function ConvexEditorGui::toggleGridSnap(%this)
 {
-    EWorldEditor.UseGridSnap = !EWorldEditor.UseGridSnap;
-    EditorSettings.setValue("WorldEditor/Tools/UseGridSnap", EWorldEditor.UseGridSnap );
-    CESnapOptions-->objectGridSnapBtn.setStateOn( EWorldEditor.UseGridSnap );
-    %this.setGridSnap( EWorldEditor.UseGridSnap );
-    EWorldEditor.setGridSnap( EWorldEditor.UseGridSnap );
+    EWorldEditor.gridSnap = !EWorldEditor.gridSnap;
+    EditorSettings.setValue("WorldEditor/Tools/gridSnap", EWorldEditor.gridSnap );
+    CESnapOptions-->objectGridSnapBtn.setStateOn( EWorldEditor.gridSnap );
+    %this.setGridSnap( EWorldEditor.gridSnap );
+    EWorldEditor.setGridSnap( EWorldEditor.gridSnap );
 }
 
 

Templates/BaseGame/game/tools/convexEditor/main.tscript

@@ -130,9 +130,9 @@ function ConvexEditorPlugin::onActivated( %this )
          ConvexEditorScaleModeBtn.performClick();
    }
 
-   EWorldEditor.UseGridSnap = EditorSettings.value("WorldEditor/Tools/UseGridSnap");
-   CESnapOptions-->objectGridSnapBtn.setStateOn( EWorldEditor.UseGridSnap );
-   %this.setGridSnap( EWorldEditor.UseGridSnap );
+   EWorldEditor.gridSnap = EditorSettings.value("WorldEditor/Tools/gridSnap");
+   CESnapOptions-->objectGridSnapBtn.setStateOn( EWorldEditor.gridSnap );
+   %this.setGridSnap( EWorldEditor.gridSnap );
 
    Parent::onActivated( %this );
    EditorGui.SetStandardPalletBar();

Templates/BaseGame/game/tools/worldEditor/scripts/EditorGui.ed.tscript

@@ -1051,9 +1051,9 @@ function WorldEditorPlugin::onActivated( %this )
       ETransformSelection.setVisible(true);
    }
 
-   EWorldEditor.UseGridSnap = EditorSettings.value("WorldEditor/Tools/UseGridSnap");
-   ESnapOptions-->GridSnapButton.setStateOn( EWorldEditor.UseGridSnap );
-   SnapToBar-->objectGridSnapBtn.setStateOn( EWorldEditor.UseGridSnap );
+   EWorldEditor.gridSnap = EditorSettings.value("WorldEditor/Tools/gridSnap");
+   ESnapOptions-->GridSnapButton.setStateOn( EWorldEditor.gridSnap );
+   SnapToBar-->objectGridSnapBtn.setStateOn( EWorldEditor.gridSnap );
 
    Parent::onActivated(%this);
 
@@ -2615,8 +2615,8 @@ function EWorldEditor::syncGui( %this )
    ESnapOptions-->SnapSize.setText( EWorldEditor.getSoftSnapSize() );
    ESnapOptions-->GridSize.setText( EWorldEditor.getGridSize() );
 
-   %this.UseGridSnap = EditorSettings.value("WorldEditor/Tools/UseGridSnap");
-   ESnapOptions-->GridSnapButton.setStateOn( %this.UseGridSnap );
+   %this.gridSnap = EditorSettings.value("WorldEditor/Tools/gridSnap");
+   ESnapOptions-->GridSnapButton.setStateOn( %this.gridSnap );
 
    %this.UseGroupCenter = EditorSettings.value("WorldEditor/Tools/UseGroupCenter");
 
@@ -2961,9 +2961,9 @@ function toggleSnappingOptions( %var )
    }
    else if( %var $= "grid" )
    {
- 	   EWorldEditor.UseGridSnap = !EWorldEditor.UseGridSnap;
-	   EditorSettings.setValue("WorldEditor/Tools/UseGridSnap", EWorldEditor.UseGridSnap );
-      EWorldEditor.setGridSnap( EWorldEditor.UseGridSnap );
+ 	   EWorldEditor.gridSnap = !EWorldEditor.gridSnap;
+	   EditorSettings.setValue("WorldEditor/Tools/gridSnap", EWorldEditor.gridSnap );
+      EWorldEditor.setGridSnap( EWorldEditor.gridSnap );
    }
    else if( %var $= "byGroup" )
    {