diff options
author | Eric Guzman | 2012-03-13 13:12:43 -0700 |
---|---|---|
committer | Eric Guzman | 2012-03-13 13:12:43 -0700 |
commit | 61fd46cad105f0a52afa028e5301b96120f00ab4 (patch) | |
tree | d8a7e23e1ea7d9b5c64a288822b7797bb19e50d4 /js/helper-classes/RDGE/src/core/script/init_state.js | |
parent | 7e3161153b87b891875ac65368a19aed12909fa3 (diff) | |
parent | f56b8cf4d3316d250c0f0045fb78f0dbd5c56e94 (diff) | |
download | ninja-61fd46cad105f0a52afa028e5301b96120f00ab4.tar.gz |
Merge branch 'refs/heads/master' into CSSPanelUpdates
Conflicts:
js/controllers/styles-controller.js
Diffstat (limited to 'js/helper-classes/RDGE/src/core/script/init_state.js')
-rwxr-xr-x | js/helper-classes/RDGE/src/core/script/init_state.js | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/js/helper-classes/RDGE/src/core/script/init_state.js b/js/helper-classes/RDGE/src/core/script/init_state.js index 4b97a4f4..5ffbbd13 100755 --- a/js/helper-classes/RDGE/src/core/script/init_state.js +++ b/js/helper-classes/RDGE/src/core/script/init_state.js | |||
@@ -42,16 +42,16 @@ LoadState.prototype.Init = function() | |||
42 | if(this.sceneName) | 42 | if(this.sceneName) |
43 | { | 43 | { |
44 | this.loadScene("assets_web/mesh/" + this.sceneName + ".json", this.sceneName); | 44 | this.loadScene("assets_web/mesh/" + this.sceneName + ".json", this.sceneName); |
45 | } | 45 | } |
46 | 46 | ||
47 | if (this.hasUserState && this.userRunState && this.userRunState.onLoadState) | 47 | if (this.hasUserState && this.userRunState && this.userRunState.onLoadState) |
48 | this.userRunState.onLoadState(); | 48 | this.userRunState.onLoadState(); |
49 | } | 49 | } |
50 | 50 | ||
51 | LoadState.prototype.ReInit = function() | 51 | LoadState.prototype.ReInit = function() |
52 | { | 52 | { |
53 | if (this.hasUserState && this.userRunState && this.userRunState.onLoadState) | 53 | if (this.hasUserState && this.userRunState && this.userRunState.onLoadState) |
54 | this.userRunState.onLoadState(); | 54 | this.userRunState.onLoadState(); |
55 | } | 55 | } |
56 | 56 | ||
57 | LoadState.prototype.Resize = function() | 57 | LoadState.prototype.Resize = function() |