Merge remote-tracking branch 'upstream/dev' into documentation_updates2

editor/js/Sidebar.Material.js

@@ -611,25 +611,25 @@ Sidebar.Material = function ( editor ) {
 
 			if ( material.color !== undefined ) {
 
-				materialColor.setValue( '#' + material.color.getHexString() );
+				materialColor.setHexValue( material.color.getHexString() );
 
 			}
 
 			if ( material.ambient !== undefined ) {
 
-				materialAmbient.setValue( '#' + material.ambient.getHexString() );
+				materialAmbient.setHexValue( material.ambient.getHexString() );
 
 			}
 
 			if ( material.emissive !== undefined ) {
 
-				materialEmissive.setValue( '#' + material.emissive.getHexString() );
+				materialEmissive.setHexValue( material.emissive.getHexString() );
 
 			}
 
 			if ( material.specular !== undefined ) {
 
-				materialSpecular.setValue( '#' + material.specular.getHexString() );
+				materialSpecular.setHexValue( material.specular.getHexString() );
 
 			}
 

editor/js/Sidebar.Object3D.js

@@ -541,13 +541,13 @@ Sidebar.Object3D = function ( editor ) {
 
 			if ( object.color !== undefined ) {
 
-				objectColor.setValue( '#' + object.color.getHexString() );
+				objectColor.setHexValue( object.color.getHexString() );
 
 			}
 
 			if ( object.groundColor !== undefined ) {
 
-				objectGroundColor.setValue( '#' + object.groundColor.getHexString() );
+				objectGroundColor.setHexValue( object.groundColor.getHexString() );
 
 			}