aboutsummaryrefslogtreecommitdiff
path: root/js/helper-classes/RDGE/GLCircle.js
diff options
context:
space:
mode:
authorValerio Virgillito2012-02-09 13:41:45 -0800
committerValerio Virgillito2012-02-09 13:41:45 -0800
commitf5193cd04a2597051d88fced878efbc4802ea64c (patch)
treedc343dc98fa9f99133d9882bd9b92cfe81296d1a /js/helper-classes/RDGE/GLCircle.js
parente2539230b8a297fa972af6d53fe9de3ef2ad43fa (diff)
parent666ae3e9119410cbf7fa974274d95336aaff091c (diff)
downloadninja-f5193cd04a2597051d88fced878efbc4802ea64c.tar.gz
Merge branch 'refs/heads/master' into components
Diffstat (limited to 'js/helper-classes/RDGE/GLCircle.js')
-rw-r--r--js/helper-classes/RDGE/GLCircle.js10
1 files changed, 6 insertions, 4 deletions
diff --git a/js/helper-classes/RDGE/GLCircle.js b/js/helper-classes/RDGE/GLCircle.js
index e6bcba89..942eb528 100644
--- a/js/helper-classes/RDGE/GLCircle.js
+++ b/js/helper-classes/RDGE/GLCircle.js
@@ -55,14 +55,16 @@ function GLCircle()
55 55
56 this.m_world = world; 56 this.m_world = world;
57 57
58
58 if(strokeMaterial) 59 if(strokeMaterial)
59 {
60 this._strokeMaterial = strokeMaterial; 60 this._strokeMaterial = strokeMaterial;
61 } 61 else
62 this._strokeMaterial = new FlatMaterial();
63
62 if(fillMaterial) 64 if(fillMaterial)
63 {
64 this._fillMaterial = fillMaterial; 65 this._fillMaterial = fillMaterial;
65 } 66 else
67 this._fillMaterial = new FlatMaterial();
66 } 68 }
67 69
68 /////////////////////////////////////////////////////////////////////// 70 ///////////////////////////////////////////////////////////////////////