Merge branch 'master' into pentool

Conflicts:
	js/tools/PenTool.js

1 files changed, 7 insertions, 4 deletions

diff --git a/js/document/models/html.js b/js/document/models/html.js
index fd42d4de..9aa0d27e 100755
--- a/js/document/models/html.js
+++ b/js/document/models/html.js
@@ -18,9 +18,12 @@ exports.HtmlDocumentModel = Montage.create(BaseDocumentModel, {
         value: false
     },
     ////////////////////////////////////////////////////////////////////
-    //
-    selection: {
-        value: []
+        //Called by the document immidiately after the model is created
+    init: {
+        value:function() {
+                //Creating instance of the webGL helper for this model
+                this.webGlHelper = webGlDocumentHelper.create();
+                }           
     },
     ////////////////////////////////////////////////////////////////////
     //
@@ -57,7 +60,7 @@ exports.HtmlDocumentModel = Montage.create(BaseDocumentModel, {
     ////////////////////////////////////////////////////////////////////
         //
         webGlHelper: {
-        value: webGlDocumentHelper
+        value: null
     },
     ////////////////////////////////////////////////////////////////////
         //