Merge pull request #154 from Henry00IS/2DSERestore

2DSE: Replaced "Load Project" with "Restore Project"
sabresaurus · Jun 18, 2018 · 1887f26 · 1887f26
2 parents efddf25 + d8354ce
commit 1887f26
Show file tree

Hide file tree

Showing 4 changed files with 68 additions and 3 deletions.
diff --git a/Gizmos/ShapeEditorRestore.png b/Gizmos/ShapeEditorRestore.png
diff --git a/Gizmos/ShapeEditorRestore.png.meta b/Gizmos/ShapeEditorRestore.png.meta
diff --git a/Scripts/Brushes/CompoundBrushes/Editor/ShapeEditorBrushInspector.cs b/Scripts/Brushes/CompoundBrushes/Editor/ShapeEditorBrushInspector.cs
@@ -18,14 +18,14 @@ public override void DoInspectorGUI()
             {
                 GUILayout.BeginHorizontal(EditorStyles.toolbar);
                 GUIStyle createBrushStyle = new GUIStyle(EditorStyles.toolbarButton);
-                if (GUILayout.Button(new GUIContent(" Show Editor", SabreCSGResources.ButtonShapeEditorTexture, "Show 2D Shape Editor"), createBrushStyle))
+                if (GUILayout.Button(new GUIContent(" Shape Editor", SabreCSGResources.ButtonShapeEditorTexture, "Show 2D Shape Editor"), createBrushStyle))
                 {
                     // display the 2d shape ditor.
                     ShapeEditorWindow.Init();
                 }
-                if (GUILayout.Button(new GUIContent(" Load Project", SabreCSGResources.ShapeEditorOpenTexture, "Load Embedded Project Into 2D Shape Editor"), createBrushStyle))
+                if (GUILayout.Button(new GUIContent(" Restore Project", SabreCSGResources.ShapeEditorRestoreTexture, "Load Embedded Project Into 2D Shape Editor"), createBrushStyle))
                 {
-                    if (EditorUtility.DisplayDialog("2D Shape Editor", "Are you sure you wish to load the embedded project?\r\nAny unsaved work in the 2D Shape Editor will be lost!", "Yes", "No"))
+                    if (EditorUtility.DisplayDialog("2D Shape Editor", "Are you sure you wish to restore the embedded project?\r\nAny unsaved work in the 2D Shape Editor will be lost!", "Yes", "No"))
                     {
                         // display the 2d shape ditor.
                         ShapeEditorWindow window = ShapeEditorWindow.InitAndGetHandle();

diff --git a/Scripts/UI/SabreCSGResources.cs b/Scripts/UI/SabreCSGResources.cs
@@ -401,6 +401,14 @@ public static Texture2D ShapeEditorOpenTexture
             }
         }
 
+        public static Texture2D ShapeEditorRestoreTexture
+        {
+            get
+            {
+                return (Texture2D)LoadObject("Gizmos/ShapeEditorRestore.png");
+            }
+        }
+
         public static Texture2D ShapeEditorRotate90LeftTexture
         {
             get
-Original file line number
+Diff line change
@@ Expand Up / @@ -401,6 +401,14 @@ public static Texture2D ShapeEditorOpenTexture @@
                 }
             }
+            public static Texture2D ShapeEditorRestoreTexture
+            {
+                get
+                {
+                    return (Texture2D)LoadObject("Gizmos/ShapeEditorRestore.png");
+                }
+            }
             public static Texture2D ShapeEditorRotate90LeftTexture
             {
                 get
@@ Expand Down @@