Merge branch 'FileIO' of github.com:joseeight/ninja-internal into FileIO

Conflicts:
	js/io/document/document-controller.js
	js/io/ui/new-file-dialog/new-file-options-navigator.reel/new-file-options-navigator.js
	js/io/ui/save-as-dialog.reel/save-as-dialog.js

Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>

1 files changed, 4 insertions, 2 deletions

diff --git a/js/models/properties-3d.js b/js/models/properties-3d.js
index 6d65bc91..cf4a045f 100755
--- a/js/models/properties-3d.js
+++ b/js/models/properties-3d.js
@@ -22,7 +22,7 @@ exports.Properties3D = Montage.create(Component, {
         _world :            {value : null, enumerable:true}, // keep a referenceto the GLWorld (if any)
 
     // Keep track of 3d properties
-    matrix3d : {value : [1,0,0,0,0,1,0,0,0,0,1,0,0,0,0,1], enumerable: true},
+    matrix3d : {value : null, enumerable: true},
 
     xAngle : {value : 0, enumerable: true},
     yAngle : {value : 0, enumerable: true},
@@ -33,9 +33,11 @@ exports.Properties3D = Montage.create(Component, {
     z3D : {value : 0, enumerable: true},
 
     //TODO - not sure if this should be part of the tool or stage or a utility
-    perspectiveDist :   { value : 1400, enumerable: true},
+    perspectiveDist :   { value : null, enumerable: true},
     perspectiveMode :   { value : null, enumerable: true},
 
+    elementPlane :   { value : null, enumerable: true},
+
     init : {
         value : function(elt) {