Browse Source

Editor: Made reflectivity independent from envMap. Fixes temporarily immutable material.side bug.

Mr.doob 9 years ago
parent
commit
3848529412
1 changed files with 12 additions and 2 deletions
  1. 12 2
      editor/js/Sidebar.Material.js

+ 12 - 2
editor/js/Sidebar.Material.js

@@ -746,9 +746,15 @@ Sidebar.Material = function ( editor ) {
 
 				}
 
-				if ( material.reflectivity !== materialReflectivity.getValue() ) {
+			}
+
+			if ( material.reflectivity !== undefined ) {
+
+				var reflectivity = materialReflectivity.getValue();
+
+				if ( material.reflectivity !== reflectivity ) {
 
-					editor.execute( new SetMaterialValueCommand( currentObject, 'reflectivity', materialReflectivity.getValue() ) );
+					editor.execute( new SetMaterialValueCommand( currentObject, 'reflectivity', reflectivity ) );
 
 				}
 
@@ -1126,6 +1132,10 @@ Sidebar.Material = function ( editor ) {
 
 			}
 
+		}
+
+		if ( material.reflectivity !== undefined ) {
+
 			materialReflectivity.setValue( material.reflectivity );
 
 		}