Merge branch 'master' into merill_thinwall

Author: lordofhyphens

.github/CONTRIBUTING.md

@@ -21,7 +21,7 @@ When possible, please include the following information when [reporting an issue
     * STL, OBJ or AMF input file (please make sure the input file is not broken, e.g. non-manifold, before reporting a bug)
     * a screenshot of the G-code layer with the issue (e.g. using [Pronterface](https://github.com/kliment/Printrun) or preferably the internal preview tab in Slic3r).
 * If the issue is a request for a new feature, be ready to explain why you think it's needed.
-    * Doing more prepatory work on your end makes it more likely it'll get done. This includes the "how" it can be done in addition to the "what". 
+    * Doing more preparatory work on your end makes it more likely it'll get done. This includes the "how" it can be done in addition to the "what". 
     * Define the "What" as strictly as you can. Consider what might happen with different infills than simple rectilinear.
 
 Please make sure only to include one issue per report. If you encounter multiple, unrelated issues, please report them as such.

.travis.yml

@@ -97,17 +97,18 @@ matrix:
           after_success:
             - if [[ "${TRAVIS_BRANCH}" != "cppgui" ]]; then ./package/osx/travis-deploy-main.sh || travis_terminate 1; fi
 
-        - os: osx
-          osx_image: xcode9.4
-          env:
-            - TARGET=cpp
-            - CACHE=$HOME/cache
-          cache:
-            ccache: true
-            directories:
-              - /usr/local/Homebrew
-              - $HOME/cache
-              - $HOME/Library/Caches/Homebrew
+        # OSX is erroring out consistently for C++, remove and debug
+              #        - os: osx
+              #          osx_image: xcode9.4
+              #          env:
+              #            - TARGET=cpp
+              #            - CACHE=$HOME/cache
+              #          cache:
+              #            ccache: true
+              #            directories:
+              #              - /usr/local/Homebrew
+              #              - $HOME/cache
+              #              - $HOME/Library/Caches/Homebrew
 
 env:
   global:

lib/Slic3r.pm

@@ -248,6 +248,7 @@ sub thread_cleanup {
     *Slic3r::Surface::DESTROY               = sub {};
     *Slic3r::Surface::Collection::DESTROY   = sub {};
     *Slic3r::TriangleMesh::DESTROY          = sub {};
+    *Slic3r::TransformationMatrix::DESTROY  = sub {};
     return undef;  # this prevents a "Scalars leaked" warning
 }
 

lib/Slic3r/GCode/MotionPlanner.pm

@@ -14,7 +14,7 @@ use Slic3r::Geometry::Clipper qw(offset offset_ex diff_ex intersection_pl);
 has '_inner_margin' => (is => 'ro', default => sub { scale 1 });
 has '_outer_margin' => (is => 'ro', default => sub { scale 2 });
 
-# this factor weigths the crossing of a perimeter 
+# this factor weighs the crossing of a perimeter 
 # vs. the alternative path. a value of 5 means that
 # a perimeter will be crossed if the alternative path
 # is >= 5x the length of the straight line we could

lib/Slic3r/GCode/PressureRegulator.pm

@@ -39,7 +39,7 @@ sub process {
             # This is a print move.
             my $F = $args->{F} // $reader->F;
             if ($F != $self->_last_print_F || ($F == $self->_last_print_F && $self->_advance == 0)) {
-                # We are setting a (potentially) new speed or a discharge event happend since the last speed change, so we calculate the new advance amount.
+                # We are setting a (potentially) new speed or a discharge event happened since the last speed change, so we calculate the new advance amount.
 
                 # First calculate relative flow rate (mm of filament over mm of travel)
                 my $rel_flow_rate = $info->{dist_E} / $info->{dist_XY};

lib/Slic3r/GUI.pm

@@ -96,7 +96,8 @@ our $Settings = {
         nudge_val => 1,
         rotation_controls => 'z',
         reload_hide_dialog => 0,
-        reload_behavior => 0
+        reload_behavior => 0,
+        reload_preserve_trafo => 1
     },
 };
 

lib/Slic3r/GUI/3DScene.pm

@@ -96,14 +96,14 @@ sub new {
     # wxWidgets expect the attrib list to be ended by zero.
     push(@$attrib, 0);
 
-    # we request a depth buffer explicitely because it looks like it's not created by 
+    # we request a depth buffer explicitly because it looks like it's not created by 
     # default on Linux, causing transparency issues
     my $self = $class->SUPER::new($parent, -1, Wx::wxDefaultPosition, Wx::wxDefaultSize, 0, "", $attrib);
 
     if (Wx::wxVERSION >= 3.000003) {
         # Wx 3.0.3 contains an ugly hack to support some advanced OpenGL attributes through the attribute list.
         # The attribute list is transferred between the wxGLCanvas and wxGLContext constructors using a single static array s_wglContextAttribs.
-        # Immediatelly force creation of the OpenGL context to consume the static variable s_wglContextAttribs.
+        # Immediately force creation of the OpenGL context to consume the static variable s_wglContextAttribs.
         $self->GetContext();
     }
 
@@ -1331,8 +1331,7 @@ sub load_object {
         my $volume = $model_object->volumes->[$volume_idx];
         foreach my $instance_idx (@$instance_idxs) {
             my $instance = $model_object->instances->[$instance_idx];
-            my $mesh = $volume->mesh->clone;
-            $instance->transform_mesh($mesh);
+            my $mesh = $volume->get_transformed_mesh($instance);
 
             my $color_idx;
             if ($self->color_by eq 'volume') {

lib/Slic3r/GUI/BedShapeDialog.pm

@@ -1,5 +1,5 @@
 # The bed shape dialog.
-# The dialog opens from Print Settins tab -> Bed Shape: Set...
+# The dialog opens from Print Settings tab -> Bed Shape: Set...
 
 package Slic3r::GUI::BedShapeDialog;
 use strict;

lib/Slic3r/GUI/ColorScheme.pm

@@ -13,8 +13,8 @@ our $DEFAULT_COLORSCHEME   = 1;
 our $SOLID_BACKGROUNDCOLOR = 0;
 our @SELECTED_COLOR   = (0, 1, 0);
 our @HOVER_COLOR      = (0.4, 0.9, 0);           # Hover over Model
-our @TOP_COLOR        = (10/255,98/255,144/255); # TOP Backgroud color
-our @BOTTOM_COLOR     = (0,0,0);                 # BOTTOM Backgroud color
+our @TOP_COLOR        = (10/255,98/255,144/255); # TOP Background color
+our @BOTTOM_COLOR     = (0,0,0);                 # BOTTOM Background color
 our @BACKGROUND_COLOR = @TOP_COLOR;              # SOLID background color
 our @GRID_COLOR       = (0.2, 0.2, 0.2, 0.4);    # Grid color
 our @GROUND_COLOR     = (0.8, 0.6, 0.5, 0.4);    # Ground or Plate color
@@ -130,7 +130,7 @@ sub getSolarized { # add this name to Preferences.pm
     @BED_SKIRT        = map { ceil($_ * 255) } @COLOR_BASE01;     # Brim/Skirt
     @BED_CLEARANCE    = map { ceil($_ * 255) } @COLOR_BLUE;       # not sure what that does
     @BED_DARK         = map { ceil($_ * 255) } @COLOR_BASE01;     # not sure what that does
-    @BACKGROUND255    = map { ceil($_ * 255) } @BACKGROUND_COLOR; # Backgroud color, this time RGB
+    @BACKGROUND255    = map { ceil($_ * 255) } @BACKGROUND_COLOR; # Background color, this time RGB
 
     # 2DToolpaths.pm colors : LAYERS Tab
     @TOOL_DARK        = @COLOR_BASE01;  # Brim/Skirt