Merge pull request RobotWebTools#128 from DLu/mesh_color

Use Material param if it is defined
k-aguete · Sep 8, 2015 · 4c479ac · 4c479ac
2 parents 4b39b57 + 012576e
commit 4c479ac
Showing 1 changed file with 1 addition and 5 deletions.
diff --git a/src/models/MeshResource.js b/src/models/MeshResource.js
@@ -59,11 +59,7 @@ ROS3D.MeshResource = function(options) {
       // add a texture to anything that is missing one
       if(material !== null) {
         var setMaterial = function(node, material) {
-          // do not overwrite the material
-          if (typeof node.material === 'undefined') {
-            node.material = material;
-          }
-          //node.material = material;
+          node.material = material;
           if (node.children) {
             for (var i = 0; i < node.children.length; i++) {
               setMaterial(node.children[i], material);