aboutsummaryrefslogtreecommitdiff
path: root/js/helper-classes/RDGE/GLRectangle.js
diff options
context:
space:
mode:
authorPushkar Joshi2012-02-02 11:28:45 -0800
committerPushkar Joshi2012-02-02 11:28:45 -0800
commitacc500d1f1c76f4e7c93ae1cfea8d925ca95e7b9 (patch)
tree877f8ca734228c11050b037ce82fc0d1e1303193 /js/helper-classes/RDGE/GLRectangle.js
parent4d4de64472603426a73b26cc98ba8206190949b8 (diff)
parent4222db97e353fb65fab787ba5927d16d9fa4e1f7 (diff)
downloadninja-acc500d1f1c76f4e7c93ae1cfea8d925ca95e7b9.tar.gz
Merge branch 'working' of c:/Code/github/emueller/ninja-internal/ into pentool
Diffstat (limited to 'js/helper-classes/RDGE/GLRectangle.js')
-rw-r--r--js/helper-classes/RDGE/GLRectangle.js9
1 files changed, 5 insertions, 4 deletions
diff --git a/js/helper-classes/RDGE/GLRectangle.js b/js/helper-classes/RDGE/GLRectangle.js
index 1334d7e6..1bb4bcac 100644
--- a/js/helper-classes/RDGE/GLRectangle.js
+++ b/js/helper-classes/RDGE/GLRectangle.js
@@ -80,13 +80,14 @@ function GLRectangle()
80 this._materialSpecular = [0.4, 0.4, 0.4, 1.0]; 80 this._materialSpecular = [0.4, 0.4, 0.4, 1.0];
81 81
82 if(strokeMaterial) 82 if(strokeMaterial)
83 {
84 this._strokeMaterial = strokeMaterial; 83 this._strokeMaterial = strokeMaterial;
85 } 84 else
85 this._strokeMaterial = new FlatMaterial();
86
86 if(fillMaterial) 87 if(fillMaterial)
87 {
88 this._fillMaterial = fillMaterial; 88 this._fillMaterial = fillMaterial;
89 } 89 else
90 this._fillMaterial = new FlatMaterial();
90 } 91 }
91 92
92 /////////////////////////////////////////////////////////////////////// 93 ///////////////////////////////////////////////////////////////////////