Merge branch 'refs/heads/master' into undo-manager

Conflicts:
	js/controllers/elements/element-controller.js

Signed-off-by: Valerio Virgillito <valerio@motorola.com>

1 files changed, 1 insertions, 5 deletions

diff --git a/js/models/properties-3d.js b/js/models/properties-3d.js
index 0a7cf8bb..c1270c3b 100755
--- a/js/models/properties-3d.js
+++ b/js/models/properties-3d.js
@@ -67,10 +67,6 @@ exports.Properties3D = Montage.create(Component, {
                 this.matrix3d = Matrix.I(4);
             }
 
-            if(this.perspectiveDist == null) {
-                this.perspectiveDist = 1400;
-            }
-
             return this;
         }
     },
@@ -94,7 +90,7 @@ exports.Properties3D = Montage.create(Component, {
     ResetTranslationValues : {
         value : function() {
 //          this.m_objStartPos = [0,0,0];
-            this.perspectiveDist = 1400;
+//            this.perspectiveDist = 1400;
         }
     }
 });
\ No newline at end of file