Merge pull request #107 from orels1/dev

Release 7.1.1

Author: orels1

Packages/sh.orels.shaders.generator/package.json

@@ -2,7 +2,7 @@
   "name": "sh.orels.shaders.generator",
   "displayName": "ORL Shader Generator",
   "description": "A template-based shader generator utilizing scripted importers",
-  "version": "7.1.0",
+  "version": "7.1.1",
   "unity": "2022.3",
   "author": {
     "name": "orels1",

Packages/sh.orels.shaders.inspector/Editor/InspectorGUI.cs

@@ -603,6 +603,7 @@ public void DrawRegularProp(MaterialEditor editor, MaterialProperty[] properties
                 // We can only repack 2D textures
                 if (property.textureDimension != TextureDimension.Tex2D) return;
                 var packerKey = property.name + "_packer";
+                _uiState.TryAdd(packerKey, false);
                 _uiState[packerKey] = TexturePacker.DrawPacker(buttonRect, (bool)_uiState[packerKey], ref _uiState, packerKey, editor.target as Material, property, editor);
 #if UNITY_2022_1_OR_NEWER
                 if (shouldRestore)
@@ -631,6 +632,7 @@ public void DrawRegularProp(MaterialEditor editor, MaterialProperty[] properties
                 // We can only repack 2D textures
                 if (property.textureDimension != TextureDimension.Tex2D) return;
                 var packerKey = property.name + "_packer";
+                _uiState.TryAdd(packerKey, false);
                 _uiState[packerKey] = TexturePacker.DrawPacker(buttonRect, (bool)_uiState[packerKey], ref _uiState, packerKey, editor.target as Material, property, editor);
 #if UNITY_2022_1_OR_NEWER
                 if (shouldRestore && EditorGUI.indentLevel != -1)

Packages/sh.orels.shaders.inspector/package.json

@@ -2,7 +2,7 @@
   "name": "sh.orels.shaders.inspector",
   "displayName": "ORL Shader Inspector",
   "description": "A simple property-based shader inspector with extension support",
-  "version": "7.1.0",
+  "version": "7.1.1",
   "unity": "2022.3",
   "author": {
     "name": "orels1",

Packages/sh.orels.shaders/package.json

@@ -2,7 +2,7 @@
   "name": "sh.orels.shaders",
   "displayName": "ORL Shaders",
   "description": "PBR Unity shaders for the Built-In pipeline built with ORL Shader Generator",
-  "version": "7.1.0",
+  "version": "7.1.1",
   "unity": "2022.3",
   "author": {
     "name": "orels1",
@@ -18,7 +18,7 @@
   "license": "MIT",
   "type": "assets",
   "vpmDependencies": {
-    "sh.orels.shaders.generator": "^7.1.0",
-    "sh.orels.shaders.inspector": "^7.1.0"
+    "sh.orels.shaders.generator": "^7.1.1",
+    "sh.orels.shaders.inspector": "^7.1.1"
   }
 }

Scripts/SetVersion.csx

@@ -167,6 +167,25 @@ Parser.Default.ParseArguments<Options>(Args)
                     packageJSON["vpmDependencies"]["sh.orels.shaders.inspector"] = $"^{newVersion}";
                 }
             }
+            else if (o.Patch)
+            {
+                var parsed = new Version(version.ToString());
+                if (parsed.IsPreRelease)
+                {
+                    Console.WriteLine($"\nVersion {version} is a pre-release, cannot bump minor version");
+                    return;
+                }
+                var newVersion = $"{parsed.Major}.{parsed.Minor}.{parsed.Patch + 1}";
+                packageJSON["version"] = newVersion;
+                Console.WriteLine($" -> {newVersion}");
+
+                if (o.UpdateDependencies && packageJSON!["name"]!.ToString() == "sh.orels.shaders")
+                {
+                    Console.WriteLine($"Updating dependencies to {newVersion} as well");
+                    packageJSON["vpmDependencies"]["sh.orels.shaders.generator"] = $"^{newVersion}";
+                    packageJSON["vpmDependencies"]["sh.orels.shaders.inspector"] = $"^{newVersion}";
+                }
+            }
             File.WriteAllText(packagePath, packageJSON!.ToJsonString(new JsonSerializerOptions { WriteIndented = true }));
         }