diff options
author | hwc487 | 2012-03-20 16:26:52 -0700 |
---|---|---|
committer | hwc487 | 2012-03-20 16:26:52 -0700 |
commit | 98a02c1ac6f189aba93d7cce64ba5bdbc0617f6c (patch) | |
tree | 93a3fc2c1aaffb97edeecc890e5540f7d15ad838 /js/lib/geom/line.js | |
parent | 43ea2515f1482eeb77454f407111f0568c056f72 (diff) | |
download | ninja-98a02c1ac6f189aba93d7cce64ba5bdbc0617f6c.tar.gz |
Bug Fixes for Canvas & WebGL File IO
Diffstat (limited to 'js/lib/geom/line.js')
-rwxr-xr-x | js/lib/geom/line.js | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/js/lib/geom/line.js b/js/lib/geom/line.js index a706eb93..e839e229 100755 --- a/js/lib/geom/line.js +++ b/js/lib/geom/line.js | |||
@@ -137,16 +137,7 @@ var Line = function GLLine( world, xOffset, yOffset, width, height, slope, strok | |||
137 | this._strokeStyle = jObj.strokeStyle; | 137 | this._strokeStyle = jObj.strokeStyle; |
138 | this._strokeColor = jObj.strokeColor; | 138 | this._strokeColor = jObj.strokeColor; |
139 | var strokeMaterialName = jObj.strokeMat; | 139 | var strokeMaterialName = jObj.strokeMat; |
140 | 140 | this.importMaterialsJSON( jObj.materials ); | |
141 | var strokeMat = MaterialsModel.getMaterial( strokeMaterialName ); | ||
142 | if (!strokeMat) { | ||
143 | console.log( "object material not found in library: " + strokeMaterialName ); | ||
144 | strokeMat = MaterialsModel.getMaterial( MaterialsModel.getDefaultMaterialName() ); | ||
145 | } | ||
146 | else | ||
147 | strokeMat = strokeMat.dup(); | ||
148 | this._strokeMaterial = strokeMat; | ||
149 | |||
150 | }; | 141 | }; |
151 | 142 | ||
152 | this.export = function() { | 143 | this.export = function() { |