update to trunk

(bzr r12588.1.31)

1 files changed, 4 insertions, 3 deletions

diff --git a/src/widgets/select-toolbar.cpp b/src/widgets/select-toolbar.cpp
index 58d7134b3..1cd4347d6 100644
--- a/src/widgets/select-toolbar.cpp
+++ b/src/widgets/select-toolbar.cpp
@@ -249,17 +249,18 @@ sp_object_layout_any_value_changed(GtkAdjustment *adj, SPWidget *spw)
         // FIXME: fix for GTK breakage, see comment in SelectedStyle::on_opacity_changed
         sp_desktop_canvas(desktop)->forceFullRedrawAfterInterruptions(0);
 
-        int transform_stroke = prefs->getBool("/options/transform/stroke", true) ? 1 : 0;
+        bool transform_stroke = prefs->getBool("/options/transform/stroke", true);
+        bool preserve = prefs->getBool("/options/preservetransform/value", false);
 
         Geom::Affine scaler;
         if (bbox_type == SPItem::VISUAL_BBOX) {
-            scaler = get_scale_transform_for_variable_stroke (*bbox_vis, *bbox_geom, transform_stroke, x0, y0, x1, y1);
+            scaler = get_scale_transform_for_variable_stroke (*bbox_vis, *bbox_geom, transform_stroke, preserve, x0, y0, x1, y1);
         } else {
             // 1) We could have use the newer get_scale_transform_for_variable_stroke() here, but to avoid regressions
             // we'll just use the old get_scale_transform_for_uniform_stroke() for now.
             // 2) get_scale_transform_for_uniform_stroke() is intended for visual bounding boxes, not geometrical ones!
             // we'll trick it into using a geometric bounding box though, by setting the stroke width to zero
-            scaler = get_scale_transform_for_uniform_stroke (*bbox_geom, 0, false, x0, y0, x1, y1);
+            scaler = get_scale_transform_for_uniform_stroke (*bbox_geom, 0, 0, false, false, x0, y0, x1, y1);
         }
 
         sp_selection_apply_affine(selection, scaler);