|
@@ -214,6 +214,8 @@ Sidebar.Properties.Material = function ( signals ) {
|
|
|
|
|
|
var selected = null;
|
|
var selected = null;
|
|
|
|
|
|
|
|
+ var dummyTexture = THREE.ImageUtils.generateDataTexture( 1, 1, new THREE.Color( 0xffffff ) );
|
|
|
|
+
|
|
function update() {
|
|
function update() {
|
|
|
|
|
|
var material = selected.material;
|
|
var material = selected.material;
|
|
@@ -227,6 +229,8 @@ Sidebar.Properties.Material = function ( signals ) {
|
|
material = new materials[ materialClass.getValue() ]();
|
|
material = new materials[ materialClass.getValue() ]();
|
|
selected.material = material;
|
|
selected.material = material;
|
|
|
|
|
|
|
|
+ material.map = dummyTexture;
|
|
|
|
+
|
|
}
|
|
}
|
|
|
|
|
|
if ( material.color !== undefined ) {
|
|
if ( material.color !== undefined ) {
|
|
@@ -261,7 +265,12 @@ Sidebar.Properties.Material = function ( signals ) {
|
|
|
|
|
|
if ( material.map !== undefined ) {
|
|
if ( material.map !== undefined ) {
|
|
|
|
|
|
- material.map = materialMapEnabled.getValue() === true ? materialMap.getValue() : null;
|
|
|
|
|
|
+ if ( materialMapEnabled.getValue() === true ) {
|
|
|
|
+
|
|
|
|
+ material.map = materialMap.getValue();
|
|
|
|
+
|
|
|
|
+ }
|
|
|
|
+ //material.map = materialMapEnabled.getValue() === true ? materialMap.getValue() : null;
|
|
material.needsUpdate = true;
|
|
material.needsUpdate = true;
|
|
|
|
|
|
}
|
|
}
|