Merge remote-tracking branch 'remotes/origin/scene_manipulators'

Disabled the gizmos.

2 files changed, 1 insertions, 2 deletions

diff --git a/xs/src/libslic3r/Polygon.cpp b/xs/src/libslic3r/Polygon.cpp
index 27f9a2ca1..b5fd7e64f 100644
--- a/xs/src/libslic3r/Polygon.cpp
+++ b/xs/src/libslic3r/Polygon.cpp
@@ -103,7 +103,7 @@ double Polygon::area() const
 
     double a = 0.;
     for (size_t i = 0, j = n - 1; i < n; ++i) {
-        a += double(points[j].x + points[i].x) * double(points[i].y - points[j].y);
+        a += ((double)points[j].x + (double)points[i].x) * ((double)points[i].y - (double)points[j].y);
         j = i;
     }
     return 0.5 * a;
diff --git a/xs/xsp/Print.xsp b/xs/xsp/Print.xsp
index e05112932..b53b5e82d 100644
--- a/xs/xsp/Print.xsp
+++ b/xs/xsp/Print.xsp
@@ -54,7 +54,6 @@ _constant()
 
     int region_volumes_count()
         %code%{ RETVAL = THIS->region_volumes.size(); %};
-            
     Ref<Print> print();
     Ref<ModelObject> model_object();
     Ref<StaticPrintConfig> config()