fix a bunch of weird entity problems

CesiumGS · Jul 24, 2018 · 6d11d0f · 6d11d0f
1 parent 1f62bd9
commit 6d11d0f
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 14 deletions.
diff --git a/Source/DataSources/StaticGeometryColorBatch.js b/Source/DataSources/StaticGeometryColorBatch.js
@@ -139,13 +139,13 @@ define([
 
                     if (defined(attributes)) {
                         if (defined(originalAttributes.show)) {
-                            originalAttributes.show.value = attributes.show;
+                            attributes.show = originalAttributes.show.value;
                         }
                         if (defined(originalAttributes.color)) {
-                            originalAttributes.color.value = attributes.color;
+                            attributes.color = originalAttributes.color.value;
                         }
                         if (defined(originalAttributes.depthFailColor)) {
-                            originalAttributes.depthFailColor.value = attributes.depthFailColor;
+                            attributes.depthFailColor = originalAttributes.depthFailColor.value;
                         }
                     }
                 }

diff --git a/Source/DataSources/StaticGeometryPerMaterialBatch.js b/Source/DataSources/StaticGeometryPerMaterialBatch.js
@@ -136,13 +136,13 @@ define([
 
                     if (defined(attributes)) {
                         if (defined(originalAttributes.show)) {
-                            originalAttributes.show.value = attributes.show;
+                            attributes.show = originalAttributes.show.value;
                         }
                         if (defined(originalAttributes.color)) {
-                            originalAttributes.color.value = attributes.color;
+                            attributes.color = originalAttributes.color.value;
                         }
                         if (defined(originalAttributes.depthFailColor)) {
-                            originalAttributes.depthFailColor.value = attributes.depthFailColor;
+                            attributes.depthFailColor = originalAttributes.depthFailColor.value;
                         }
                     }
                 }

diff --git a/Source/DataSources/StaticGroundGeometryColorBatch.js b/Source/DataSources/StaticGroundGeometryColorBatch.js
@@ -106,10 +106,10 @@ define([
 
                     if (defined(attributes)) {
                         if (defined(originalAttributes.show)) {
-                            originalAttributes.show.value = attributes.show;
+                            attributes.show = originalAttributes.show.value;
                         }
                         if (defined(originalAttributes.color)) {
-                            originalAttributes.color.value = attributes.color;
+                            attributes.color = originalAttributes.color.value;
                         }
                     }
                 }

diff --git a/Source/DataSources/StaticGroundGeometryPerMaterialBatch.js b/Source/DataSources/StaticGroundGeometryPerMaterialBatch.js
@@ -140,10 +140,10 @@ define([
 
                     if (defined(attributes)) {
                         if (defined(originalAttributes.show)) {
-                            originalAttributes.show.value = attributes.show;
+                            attributes.show = originalAttributes.show.value;
                         }
                         if (defined(originalAttributes.color)) {
-                            originalAttributes.color.value = attributes.color;
+                            attributes.color = originalAttributes.color.value;
                         }
                     }
                 }

diff --git a/Source/DataSources/StaticGroundPolylinePerMaterialBatch.js b/Source/DataSources/StaticGroundPolylinePerMaterialBatch.js
@@ -134,10 +134,10 @@ define([
 
                     if (defined(attributes)) {
                         if (defined(originalAttributes.show)) {
-                            originalAttributes.show.value = attributes.show;
+                            attributes.show = originalAttributes.show.value;
                         }
                         if (defined(originalAttributes.color)) {
-                            originalAttributes.color.value = attributes.color;
+                            attributes.color = originalAttributes.color.value;
                         }
                     }
                 }

diff --git a/Source/DataSources/StaticOutlineGeometryBatch.js b/Source/DataSources/StaticOutlineGeometryBatch.js
@@ -109,10 +109,10 @@ define([
 
                     if (defined(attributes)) {
                         if (defined(originalAttributes.show)) {
-                            originalAttributes.show.value = attributes.show;
+                            attributes.show = originalAttributes.show.value;
                         }
                         if (defined(originalAttributes.color)) {
-                            originalAttributes.color.value = attributes.color;
+                            attributes.color = originalAttributes.color.value;
                         }
                     }
                 }