diff options
| author | Nivesh Rajbhandari | 2012-02-09 12:02:27 -0800 |
|---|---|---|
| committer | Nivesh Rajbhandari | 2012-02-09 12:02:27 -0800 |
| commit | a9b1a1f2642841c4165ede69d131b1deb6238622 (patch) | |
| tree | 2076dc497fbde041283af8b0082b0f4e24c9e1c6 /js/helper-classes/RDGE/GLGeomObj.js | |
| parent | 31e2eb0d0da9b032116ad073918ca36ec11dac45 (diff) | |
| parent | ce81a3f4387d80f9ac406e73b843fb5dbe9cf432 (diff) | |
| download | ninja-a9b1a1f2642841c4165ede69d131b1deb6238622.tar.gz | |
Merge branch 'refs/heads/ninja-internal' into SnapManagerFixes
Conflicts:
js/helper-classes/RDGE/Materials/FlatMaterial.js
Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
Diffstat (limited to 'js/helper-classes/RDGE/GLGeomObj.js')
| -rw-r--r-- | js/helper-classes/RDGE/GLGeomObj.js | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/js/helper-classes/RDGE/GLGeomObj.js b/js/helper-classes/RDGE/GLGeomObj.js index 62fbf562..5d7497ad 100644 --- a/js/helper-classes/RDGE/GLGeomObj.js +++ b/js/helper-classes/RDGE/GLGeomObj.js | |||
| @@ -103,6 +103,9 @@ function GLGeomObj() | |||
| 103 | } | 103 | } |
| 104 | } | 104 | } |
| 105 | } | 105 | } |
| 106 | |||
| 107 | var world = this.getWorld(); | ||
| 108 | if (world) world.restartRenderLoop(); | ||
| 106 | } | 109 | } |
| 107 | 110 | ||
| 108 | this.setFillColor = function(c) { this.setMaterialColor(c, "fill"); } | 111 | this.setFillColor = function(c) { this.setMaterialColor(c, "fill"); } |