Merge branch 'refs/heads/master' into StylesControllerUpdates

Conflicts:
	js/controllers/styles-controller.js

1 files changed, 6 insertions, 1 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 8c69d218..4b97a4f4 100644
--- a/js/helper-classes/RDGE/src/core/script/init_state.js
+++ b/js/helper-classes/RDGE/src/core/script/init_state.js
@@ -42,11 +42,16 @@ LoadState.prototype.Init = function()
         if(this.sceneName)

         {

                 this.loadScene("assets_web/mesh/" + this.sceneName + ".json", this.sceneName);

-        }

+        }
+
+        if (this.hasUserState && this.userRunState && this.userRunState.onLoadState)
+                this.userRunState.onLoadState();
 }

 

 LoadState.prototype.ReInit = function() 

 {

+        if (this.hasUserState && this.userRunState && this.userRunState.onLoadState)
+                this.userRunState.onLoadState();
 }

 

 LoadState.prototype.Resize = function()