From 0219637a6bb18042ed4c118dca42d4530c5e18b7 Mon Sep 17 00:00:00 2001
From: Luis Fernando Molina <Luis-Fernando-Molina@users.noreply.github.com>
Date: Thu, 31 Dec 2020 14:11:04 +0100
Subject: [PATCH] initialization order changed

---
 UI/Canvas.js | 54 ++++++++++++++++++++++++++--------------------------
 1 file changed, 27 insertions(+), 27 deletions(-)

diff --git a/UI/Canvas.js b/UI/Canvas.js
index 7f721c044..0865f73db 100644
--- a/UI/Canvas.js
+++ b/UI/Canvas.js
@@ -121,6 +121,33 @@ function newCanvas() {
                 let spaceAnimationDrawMap = new Map()
                 let spaceDefinitionDrawMap = new Map()
 
+                /* Set up Globals of this Project */
+                if (projectDefinition.UI.globals !== undefined) {
+                    for (let j = 0; j < projectDefinition.UI.globals.length; j++) {
+                        let globalDefinition = projectDefinition.UI.globals[j]
+
+                        projectInstance.globals[globalDefinition.propertyName] = eval(globalDefinition.functionName + '()')
+                    }
+                }
+
+                /* Set up Utilities of this Project */
+                if (projectDefinition.UI.utilities !== undefined) {
+                    for (let j = 0; j < projectDefinition.UI.utilities.length; j++) {
+                        let utilityDefinition = projectDefinition.UI.utilities[j]
+
+                        projectInstance.utilities[utilityDefinition.propertyName] = eval(utilityDefinition.functionName + '()')
+                    }
+                }
+
+                /* Set up Function Libraries of this Project */
+                if (projectDefinition.UI.functionLibraries !== undefined) {
+                    for (let j = 0; j < projectDefinition.UI.functionLibraries.length; j++) {
+                        let functionLibraryDefinition = projectDefinition.UI.functionLibraries[j]
+
+                        projectInstance.functionLibraries[functionLibraryDefinition.propertyName] = eval(functionLibraryDefinition.functionName + '()')
+                    }
+                }
+                
                 /* Space Instantiation */
                 if (projectDefinition.UI.spaces === undefined) { continue }
                 for (let j = 0; j < projectDefinition.UI.spaces.length; j++) {
@@ -185,33 +212,6 @@ function newCanvas() {
                         thisObject.animation.addCallBackFunction(spaceDefinition.name + ' ' + 'Draw', spaceInstance.draw)
                     }
                 }
-
-                /* Set up Utilities of this Project */
-                if (projectDefinition.UI.utilities !== undefined) {
-                    for (let j = 0; j < projectDefinition.UI.utilities.length; j++) {
-                        let utilityDefinition = projectDefinition.UI.utilities[j]
-
-                        projectInstance.utilities[utilityDefinition.propertyName] = eval(utilityDefinition.functionName + '()')
-                    }
-                }
-
-                /* Set up Globals of this Project */
-                if (projectDefinition.UI.globals !== undefined) {
-                    for (let j = 0; j < projectDefinition.UI.globals.length; j++) {
-                        let globalDefinition = projectDefinition.UI.globals[j]
-
-                        projectInstance.globals[globalDefinition.propertyName] = eval(globalDefinition.functionName + '()')
-                    }
-                }
-
-                /* Set up Function Libraries of this Project */
-                if (projectDefinition.UI.functionLibraries !== undefined) {
-                    for (let j = 0; j < projectDefinition.UI.functionLibraries.length; j++) {
-                        let functionLibraryDefinition = projectDefinition.UI.functionLibraries[j]
-
-                        projectInstance.functionLibraries[functionLibraryDefinition.propertyName] = eval(functionLibraryDefinition.functionName + '()')
-                    }
-                }
             }
             thisObject.animation.start()