Retain the 3D box attribute when doing a color tweak only (so that the box can be...

diff --git a/src/tweak-context.cpp b/src/tweak-context.cpp
index 09e13f1fc21a7e37f954690160c246d6c8c25f79..736ebf2eb7e5f7764f6123198dcb38eecbdddd51 100644 (file)
--- a/src/tweak-context.cpp
+++ b/src/tweak-context.cpp
@@ -337,6 +337,12 @@ sp_tweak_dilate_recursive (Inkscape::Selection *selection, SPItem *item, NR::Poi
 {
     bool did = false;
 
+    if (SP_IS_BOX3D(item)) {
+        // convert 3D boxes to ordinary groups before tweaking their shapes
+        item = SP_ITEM(box3d_convert_to_group(SP_BOX3D(item)));
+        selection->add(item);
+    }
+
     if (SP_IS_GROUP(item)) {
         for (SPObject *child = sp_object_first_child(SP_OBJECT(item)) ; child != NULL; child = SP_OBJECT_NEXT(child) ) {
             if (SP_IS_ITEM(child)) {
@@ -844,12 +850,6 @@ sp_tweak_dilate (SPTweakContext *tc, NR::Point event_p, NR::Point p, NR::Point v
 
         SPItem *item = (SPItem *) items->data;
 
-        if (SP_IS_BOX3D(item)) {
-            // convert 3D boxes to ordinary groups before tweaking their shapes
-            item = SP_ITEM(box3d_convert_to_group(SP_BOX3D(item)));
-            selection->add(item);
-        }
-
         if (tc->mode == TWEAK_MODE_COLORPAINT || tc->mode == TWEAK_MODE_COLORJITTER) {
             if (do_fill || do_stroke || do_opacity) {
                 if (sp_tweak_color_recursive (tc->mode, item, item_at_point,