From bbf8610c57fc12fb6d3b806b1ae8c58ffe5c7106 Mon Sep 17 00:00:00 2001
From: whitequark <whitequark@whitequark.org>
Date: Sun, 9 Oct 2016 13:26:58 +0000
Subject: [PATCH] Make translate/rotate groups inherit the "suppress solid
 model" option.

---
 CHANGELOG.md      | 1 +
 src/groupmesh.cpp | 6 ++++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 63dee5b..af9b403 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -20,6 +20,7 @@ Bug fixes:
   * Forcibly show the current group once we start a drawing operation.
   * DXF export: always declare layers before using them.
   * Do not truncate operations on selections to first 32 selected entities.
+  * Translate and rotate groups inherit the "suppress solid model" setting.
 
 2.1
 ---
diff --git a/src/groupmesh.cpp b/src/groupmesh.cpp
index 342f0c2..77130bc 100644
--- a/src/groupmesh.cpp
+++ b/src/groupmesh.cpp
@@ -203,8 +203,10 @@ void Group::GenerateShellAndMesh(void) {
         // not our own previous group.
         srcg = SK.GetGroup(opA);
 
-        GenerateForStepAndRepeat<SShell>(&(srcg->thisShell), &thisShell);
-        GenerateForStepAndRepeat<SMesh> (&(srcg->thisMesh),  &thisMesh);
+        if(!srcg->suppress) {
+            GenerateForStepAndRepeat<SShell>(&(srcg->thisShell), &thisShell);
+            GenerateForStepAndRepeat<SMesh> (&(srcg->thisMesh),  &thisMesh);
+        }
     } else if(type == EXTRUDE && haveSrc) {
         Group *src = SK.GetGroup(opA);
         Vector translate = Vector::From(h.param(0), h.param(1), h.param(2));