Merge branch 'refs/heads/NINJA-master' into TimelineUber

Conflicts:
	js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html
	js/panels/Timeline/TimelinePanel.reel/css/TimelinePanel.css

Signed-off-by: Jonathan Duran <jduran@motorola.com>

1 files changed, 2 insertions, 2 deletions

diff --git a/js/helper-classes/3D/snap-manager.js b/js/helper-classes/3D/snap-manager.js
index d3db6567..62affc53 100755
--- a/js/helper-classes/3D/snap-manager.js
+++ b/js/helper-classes/3D/snap-manager.js
@@ -109,11 +109,11 @@ var SnapManager = exports.SnapManager = Montage.create(Component, {
     popWorkingPlane : { value: function ()      { workingPlane = this._workingPlaneStack.pop(); return workingPlane; }},
 
     getStageWidth : { value: function ()        {
-        return parseInt(this.currentStage.offsetWidth);
+        return this.currentStage.elementModel.getProperty("offsetWidth") || parseInt(this.currentStage.offsetWidth);
     }},
 
     getStageHeight : { value: function ()       {
-        return parseInt(this.currentStage.offsetHeight);
+        return this.currentStage.elementModel.getProperty("offsetHeight") || parseInt(this.currentStage.offsetHeight);
     }},
 
     getStage : { value: function()      {        return this.currentStage;    }},