Merge branch 'master' into develop

Assets/Shaders/DecalFeatureBumped.shader

@@ -22,7 +22,7 @@ Shader "ConformalDecals/Feature/Bumped"
     }
     SubShader
     {
-        Tags { "Queue" = "Geometry+100" }
+        Tags { "Queue" = "Geometry+100" "IgnoreProjector" = "true"}
         Cull [_Cull]
         Ztest LEqual  
         

Assets/Shaders/DecalPaint.shader

@@ -25,7 +25,7 @@ Shader "ConformalDecals/Paint/Diffuse"
     }
     SubShader
     {
-        Tags { "Queue" = "Geometry+100" }
+        Tags { "Queue" = "Geometry+100" "IgnoreProjector" = "true"}
         Cull [_Cull]
         Ztest LEqual  
         

Assets/Shaders/DecalPaintSDF.shader

@@ -27,7 +27,7 @@ Shader "ConformalDecals/Paint/DiffuseSDF"
     }
     SubShader
     {
-        Tags { "Queue" = "Geometry+100" }
+        Tags { "Queue" = "Geometry+100" "IgnoreProjector" = "true"}
         Cull [_Cull]
         Ztest LEqual  
         

Assets/Shaders/DecalPaintSpecular.shader

@@ -30,7 +30,7 @@ Shader "ConformalDecals/Paint/Specular"
     }
     SubShader
     {
-        Tags { "Queue" = "Geometry+100" }
+        Tags { "Queue" = "Geometry+100" "IgnoreProjector" = "true"}
         Cull [_Cull]
         Ztest LEqual  
         

Assets/Shaders/DecalPaintSpecularSDF.shader

@@ -32,7 +32,7 @@ Shader "ConformalDecals/Paint/SpecularSDF"
     }
      SubShader
     {
-        Tags { "Queue" = "Geometry+100" }
+        Tags { "Queue" = "Geometry+100" "IgnoreProjector" = "true"}
         Cull [_Cull]
         Ztest LEqual  
         

Assets/Shaders/SelectionGlow.shader

@@ -12,7 +12,7 @@ Shader "ConformalDecals/SelectionGlow"
     }
     SubShader
     {
-        Tags { "Queue" = "Transparent" }
+        Tags { "Queue" = "Transparent" "IgnoreProjector" = "true" }
         Cull Back
         ZWrite Off 
         

GameData/ConformalDecals/Assets/decal-blank.mu

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:cf169fd66e880660d0f1d1cd7dd255ca6127f8ffaec5228ed00fcb16d7093fbc
+oid sha256:6a2be8e67bfc2fde45367d40cb6db69ae5dd03ff486e53346c85734e05caa15d
 size 4972

GameData/ConformalDecals/Plugins/ConformalDecals.dll

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:5529e752fe264bfb82ad737fe7c3fa1073c90708ced4b7acd75a074654d4685c
+oid sha256:d78fc217dd3f5d2ab557d56890a6a7e5d003ed7c4964eeeb5e1eee3af18f1b54
 size 41472

GameData/ConformalDecals/Resources/conformaldecals.shab

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:6021352c2c8a9fe77df77838ae961d4ccaeeef51295bcdecbb798cfbbad00a52
-size 170261
+oid sha256:0f28c5cee84474aed6d74cb4d6be9a996ae8bc8791b60d12009605f3dc913d65
+size 170325

Source/ConformalDecals/ModuleConformalDecal.cs

@@ -240,6 +240,17 @@ namespace ConformalDecals {
 
             UpdateMaterials();
 
+            // handle tweakables
+            if (HighLogic.LoadedSceneIsEditor) {
+                GameEvents.onEditorPartEvent.Add(OnEditorEvent);
+                GameEvents.onVariantApplied.Add(OnVariantApplied);
+
+                UpdateTweakables();
+            }
+        }
+
+        public override void OnStartFinished(StartState state) {
+            // handle game events
             if (HighLogic.LoadedSceneIsGame) {
                 // set initial attachment state
                 if (part.parent == null) {
@@ -249,27 +260,20 @@ namespace ConformalDecals {
                     OnAttach();
                 }
             }
-
-            // handle tweakables
-            if (HighLogic.LoadedSceneIsEditor) {
-                GameEvents.onEditorPartEvent.Add(OnEditorEvent);
-                GameEvents.onVariantApplied.Add(OnVariantApplied);
-
-                UpdateTweakables();
-            }
             
             // handle flight events
             if (HighLogic.LoadedSceneIsFlight) {
                 GameEvents.onPartWillDie.Add(OnPartWillDie);
                 
+                if (part.parent == null) part.explode();
+                
                 Part.layerMask |= 1 << DecalConfig.DecalLayer;
                 decalColliderTransform.gameObject.layer = DecalConfig.DecalLayer;
 
                 if (!selectableInFlight || !DecalConfig.SelectableInFlight) {
                     decalColliderTransform.GetComponent<Collider>().enabled = false;
+                    _boundsRenderer.enabled = false;
                 }
-
-                if (part.parent == null) part.explode();
             }
         }
 

changelog.txt

@@ -1,4 +1,3 @@
-
 v0.2.0
 ------
 - New Parts:
@@ -7,6 +6,14 @@ v0.2.0
  - Fixed WIDTH and HEIGHT scale modes being flipped
  - Removed debug log statements
 
+v0.1.4
+------
+- Fixes:
+ - Fixed decals rendering onto disabled B9PS part variants
+   - Decals will still not update whan their parent part's B9PS variant is changed, both in flight and in the editor. This is known and awaiting a change to B9PS to be fixed.
+ - Fixed decal bounds rendering as dark cubes when shadowed by EVE clouds.
+ - Fixed decals being shadowed by EVE clouds, causing the part underneath to appear overly dark.
+
 v0.1.3
 ------
 Fixes:
@@ -19,8 +26,6 @@ Changes:
 - Small refactor of node parsing code
   - Colors can now be specified in hex (#RGB, #RGBA, #RRGGBB, or #RRGGBBAA) or using the colors specified in the XKCDColors class
 
-
-
 v0.1.2
 ------
 Fixes: