Browse Source

Editor: Map row wasn't being updated.

Mr.doob 13 years ago
parent
commit
3616896687
2 changed files with 2 additions and 0 deletions
  1. 1 0
      editor/js/ui/Sidebar.Properties.Material.js
  2. 1 0
      editor/js/ui/Viewport.js

+ 1 - 0
editor/js/ui/Sidebar.Properties.Material.js

@@ -296,6 +296,7 @@ Sidebar.Properties.Material = function ( signals ) {
 			'emissive': materialEmissiveRow,
 			'specular': materialSpecularRow,
 			'shininess': materialShininessRow,
+			'map': materialMapRow,
 			'lightMap': materialLightMapRow,
 			'bumpMap': materialBumpMapRow,
 			'normalMap': materialNormalMapRow,

+ 1 - 0
editor/js/ui/Viewport.js

@@ -38,6 +38,7 @@ var Viewport = function ( signals ) {
 
 	var selectionAxis = new THREE.AxisHelper( 100 );
 	selectionAxis.material.depthTest = false;
+	selectionAxis.material.transparent = true;
 	selectionAxis.matrixAutoUpdate = false;
 	selectionAxis.visible = false;
 	sceneHelpers.add( selectionAxis );