diff options
author | Jose Antonio Marquez | 2012-02-09 12:09:09 -0800 |
---|---|---|
committer | Jose Antonio Marquez | 2012-02-09 12:09:09 -0800 |
commit | 44c65bc6bbd5b754f9073f93a3afca8dd9acc864 (patch) | |
tree | 0e9ac4c8b2f8ce3246739ab06053e9986e8c9b51 /js/helper-classes/RDGE/GLCircle.js | |
parent | d7e198f5a95011679fa2c536780edbdc533a4893 (diff) | |
parent | ce81a3f4387d80f9ac406e73b843fb5dbe9cf432 (diff) | |
download | ninja-44c65bc6bbd5b754f9073f93a3afca8dd9acc864.tar.gz |
Merge branch 'refs/heads/NinjaInternal' into FileIO
Diffstat (limited to 'js/helper-classes/RDGE/GLCircle.js')
-rwxr-xr-x | js/helper-classes/RDGE/GLCircle.js | 10 |
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 100755 --- 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 | /////////////////////////////////////////////////////////////////////// |