fix duplicated city lights

rbray89 · May 14, 2016 · 5503d34 · 5503d34
1 parent 7427c3c
commit 5503d34
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 3 deletions.
diff --git a/AnyCPU-EVE-Release.zip b/AnyCPU-EVE-Release.zip
diff --git a/AnyCPU-EVE.zip b/AnyCPU-EVE.zip
diff --git a/CityLights/CityLightsObject.cs b/CityLights/CityLightsObject.cs
@@ -182,6 +182,8 @@ public void Remove()
             Transform transform = Tools.GetScaledTransform(body);
             if (transform != null)
             {
+
+                CityLightsManager.Log("Removing scaled obj");
                 OverlayRenderer.Remove(transform.gameObject, scaledMat);
 
                 GameObject.DestroyImmediate(transform.gameObject.GetComponents<ScaledCityComponent>().First(sc => sc.GUID == materialName));

diff --git a/Utils/MaterialPQS.cs b/Utils/MaterialPQS.cs
@@ -12,14 +12,14 @@ public class OverlayRenderer: MonoBehaviour
     {
         private Material material;
         public Material Material { get { return material; } set {
-                material = value;
+
                 Renderer r = this.gameObject.GetComponent<Renderer>();
                 if (r != null)
                 {
-                    if (material != null)
+                    if (value != null)
                     {
                         List<Material> materials = new List<Material>(r.sharedMaterials);
-                        materials.Add(material);
+                        materials.Add(value);
                         r.sharedMaterials = materials.ToArray();
                     }
                     else
@@ -29,6 +29,7 @@ public class OverlayRenderer: MonoBehaviour
                         r.sharedMaterials = materials.ToArray();
                     }
                 }
+                material = value;
             } }
 
         public static void Add(GameObject go, Material material)