diff options
author | hwc487 | 2012-04-13 11:52:13 -0700 |
---|---|---|
committer | hwc487 | 2012-04-13 11:52:13 -0700 |
commit | 4f2fb5764703cab4ce3ada719b1395ed1e2f3b7c (patch) | |
tree | 3dc2e3c5a041179eed38eab1a00f851554e50005 /js/lib/geom/rectangle.js | |
parent | 521df0ed9242efff45715998837068c87aca7efd (diff) | |
parent | 4b900ea5cd6bb77eb30cec8c03b9ec9fa662c1e9 (diff) | |
download | ninja-4f2fb5764703cab4ce3ada719b1395ed1e2f3b7c.tar.gz |
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Snapping_II
Conflicts:
js/helper-classes/3D/view-utils.js
js/panels/presets/animations-presets.reel/animations-presets.js
js/panels/presets/style-presets.reel/style-presets.js
js/panels/presets/transitions-presets.reel/transitions-presets.js
js/tools/Translate3DToolBase.js
Diffstat (limited to 'js/lib/geom/rectangle.js')
-rwxr-xr-x | js/lib/geom/rectangle.js | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/js/lib/geom/rectangle.js b/js/lib/geom/rectangle.js index 00c40eb9..91b1d426 100755 --- a/js/lib/geom/rectangle.js +++ b/js/lib/geom/rectangle.js | |||
@@ -231,6 +231,21 @@ var Rectangle = function GLRectangle() { | |||
231 | this._strokeStyle = jObj.strokeStyle; | 231 | this._strokeStyle = jObj.strokeStyle; |
232 | var strokeMaterialName = jObj.strokeMat; | 232 | var strokeMaterialName = jObj.strokeMat; |
233 | var fillMaterialName = jObj.fillMat; | 233 | var fillMaterialName = jObj.fillMat; |
234 | |||
235 | var strokeMat = MaterialsModel.getMaterial( strokeMaterialName ); | ||
236 | if (!strokeMat) { | ||
237 | console.log( "object material not found in library: " + strokeMaterialName ); | ||
238 | strokeMat = MaterialsModel.getMaterial( MaterialsModel.getDefaultMaterialName() ); | ||
239 | } | ||
240 | this._strokeMaterial = strokeMat; | ||
241 | |||
242 | var fillMat = MaterialsModel.getMaterial( fillMaterialName ); | ||
243 | if (!fillMat) { | ||
244 | console.log( "object material not found in library: " + fillMaterialName ); | ||
245 | fillMat = MaterialsModel.getMaterial( MaterialsModel.getDefaultMaterialName() ); | ||
246 | } | ||
247 | this._fillMaterial = fillMat; | ||
248 | |||
234 | this.importMaterialsJSON( jObj.materials ); | 249 | this.importMaterialsJSON( jObj.materials ); |
235 | }; | 250 | }; |
236 | 251 | ||