diff options
| author | Ananya Sen | 2012-02-29 15:21:31 -0800 |
|---|---|---|
| committer | Ananya Sen | 2012-02-29 15:21:31 -0800 |
| commit | 8fee7d6bdb55ba18f396c3523081b18499fa1e30 (patch) | |
| tree | dbd17232983247a38bb6b2cea480242bdf3f2422 /js/helper-classes/RDGE/GLGeomObj.js | |
| parent | 5d4f1aad01737695238582c704e6d4f2c3a2f317 (diff) | |
| parent | b09956e4a9a35c5588cc7cd1f01efb617cbe0884 (diff) | |
| download | ninja-8fee7d6bdb55ba18f396c3523081b18499fa1e30.tar.gz | |
Merge branch 'refs/heads/ninja-internal-master' into FileIO
Conflicts:
js/controllers/selection-controller.js
js/document/html-document.js
js/panels/properties/content.reel/content.js
Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
Diffstat (limited to 'js/helper-classes/RDGE/GLGeomObj.js')
| -rwxr-xr-x | js/helper-classes/RDGE/GLGeomObj.js | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/js/helper-classes/RDGE/GLGeomObj.js b/js/helper-classes/RDGE/GLGeomObj.js index 5d7497ad..c1ee01ba 100755 --- a/js/helper-classes/RDGE/GLGeomObj.js +++ b/js/helper-classes/RDGE/GLGeomObj.js | |||
| @@ -38,8 +38,8 @@ function GLGeomObj() | |||
| 38 | this.m_world = null; | 38 | this.m_world = null; |
| 39 | 39 | ||
| 40 | // stroke and fill colors | 40 | // stroke and fill colors |
| 41 | this._strokeColor; | 41 | this._strokeColor = [0,0,0,0]; |
| 42 | this._fillColor; | 42 | this._fillColor = [0,0,0,0]; |
| 43 | 43 | ||
| 44 | // stroke and fill materials | 44 | // stroke and fill materials |
| 45 | this._fillMaterial; | 45 | this._fillMaterial; |