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

mrdoob · mrdoob · commit 38485294120c · 2016-07-01T22:06:21.000-07:00
diff --git a/editor/js/Sidebar.Material.js b/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 );
 
 		}

Original file line number	Diff line number	Diff line change
`@@ -746,9 +746,15 @@ Sidebar.Material = function ( editor ) {`
`746`	`746`
`747`	`747`	`}`
`748`	`748`
`749`		`- if ( material.reflectivity !== materialReflectivity.getValue() ) {`
	`749`	`+ }`
	`750`	`+`
	`751`	`+ if ( material.reflectivity !== undefined ) {`
	`752`	`+`
	`753`	`+ var reflectivity = materialReflectivity.getValue();`
	`754`	`+`
	`755`	`+ if ( material.reflectivity !== reflectivity ) {`
`750`	`756`
`751`		`- editor.execute( new SetMaterialValueCommand( currentObject, 'reflectivity', materialReflectivity.getValue() ) );`
	`757`	`+ editor.execute( new SetMaterialValueCommand( currentObject, 'reflectivity', reflectivity ) );`
`752`	`758`
`753`	`759`	`}`
`754`	`760`
`@@ -1126,6 +1132,10 @@ Sidebar.Material = function ( editor ) {`
`1126`	`1132`
`1127`	`1133`	`}`
`1128`	`1134`
	`1135`	`+ }`
	`1136`	`+`
	`1137`	`+ if ( material.reflectivity !== undefined ) {`
	`1138`	`+`
`1129`	`1139`	`materialReflectivity.setValue( material.reflectivity );`
`1130`	`1140`
`1131`	`1141`	`}`