aboutsummaryrefslogtreecommitdiff
path: root/assets
diff options
context:
space:
mode:
authorNivesh Rajbhandari2012-04-05 10:31:45 -0700
committerNivesh Rajbhandari2012-04-05 10:31:45 -0700
commit55f4835aa33546f5cd27e501ed461a0f7eb5038b (patch)
tree2bac6f39d12fcf2116a7f79acf45c1672d6f5522 /assets
parent4ae2fd54e3844d788536dd00814c6aad0aa9f121 (diff)
downloadninja-55f4835aa33546f5cd27e501ed461a0f7eb5038b.tar.gz
Undoing mistakes from auto-merge.
Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
Diffstat (limited to 'assets')
-rw-r--r--assets/canvas-runtime.js8
1 files changed, 0 insertions, 8 deletions
diff --git a/assets/canvas-runtime.js b/assets/canvas-runtime.js
index 2ca76962..7893786e 100644
--- a/assets/canvas-runtime.js
+++ b/assets/canvas-runtime.js
@@ -121,14 +121,6 @@ NinjaCvsRt.GLRuntime = function ( canvas, jObj, assetPath )
121 // all "live" materials 121 // all "live" materials
122 this._materials = []; 122 this._materials = [];
123 123
124 // provide the mapping for the asset directory
125 if (assetPath)
126 {
127 this._assetPath = assetPath.slice();
128 if (this._assetPath[this._assetPath.length-1] != '/')
129 this._assetPath += '/';
130 }
131
132 if(this._assetPath !== undefined) { 124 if(this._assetPath !== undefined) {
133 RDGE.globals.engine.setAssetPath(this._assetPath); 125 RDGE.globals.engine.setAssetPath(this._assetPath);
134 } 126 }