Merge branch 'refs/heads/master' into CSSPanelUpdates

Conflicts:
	js/controllers/styles-controller.js

1 files changed, 4 insertions, 1 deletions

diff --git a/js/helper-classes/3D/math-utils.js b/js/helper-classes/3D/math-utils.js
index 562a6e73..2f0283a9 100755
--- a/js/helper-classes/3D/math-utils.js
+++ b/js/helper-classes/3D/math-utils.js
@@ -729,7 +729,10 @@ var MathUtilsClass = exports.MathUtilsClass = Object.create(Object.prototype, {
             // the area of the polygon is the length of the normal
             var area = VecUtils.vecMag(3, normal );
             if (this.fpSign(area) != 0)
-                vec3.scale(normal, 1.0/area);
+                        {
+                //vec3.scale(normal, 1.0/area);
+                                normal = VecUtils.vecNormalize(3, normal, 1.0);
+                        }
 
             return normal;
         }