aboutsummaryrefslogtreecommitdiff
path: root/js/lib
diff options
context:
space:
mode:
authorhwc4872012-06-15 13:25:12 -0700
committerhwc4872012-06-15 13:25:12 -0700
commit812851b925bf3d7560ebcc10e51e509a08b69db6 (patch)
treea614796497d3a48c676a97e2b0bde8490f829243 /js/lib
parentdec69c3766aab7cf4c0ef2ebee6718efc4934e81 (diff)
downloadninja-812851b925bf3d7560ebcc10e51e509a08b69db6.tar.gz
Fixed a problem with Uber shader where new values were getting clobbered by old values.
Diffstat (limited to 'js/lib')
-rwxr-xr-xjs/lib/rdge/materials/uber-material.js3
1 files changed, 2 insertions, 1 deletions
diff --git a/js/lib/rdge/materials/uber-material.js b/js/lib/rdge/materials/uber-material.js
index 31a8756c..347e45d3 100755
--- a/js/lib/rdge/materials/uber-material.js
+++ b/js/lib/rdge/materials/uber-material.js
@@ -358,13 +358,14 @@ var UberMaterial = function UberMaterial() {
358 newMat._useLights = this._useLights; 358 newMat._useLights = this._useLights;
359 newMat._useNormalMap = this._useNormalMap; 359 newMat._useNormalMap = this._useNormalMap;
360 newMat._useSpecularMap = this._useSpecularMap; 360 newMat._useSpecularMap = this._useSpecularMap;
361 newMat.rebuildShader();
362 361
363 // copy over the current values; 362 // copy over the current values;
364 var n = propNames.length; 363 var n = propNames.length;
365 for (var i = 0; i < n; i++) 364 for (var i = 0; i < n; i++)
366 newMat.setProperty(propNames[i], propValues[i]); 365 newMat.setProperty(propNames[i], propValues[i]);
367 366
367 newMat.rebuildShader();
368
368 return newMat; 369 return newMat;
369 }; 370 };
370 371