Fixes FreeCAD#14772: Random color problem

wwmayer · Jun 29, 2024 · ec890a8 · ec890a8
1 parent f28394a
commit ec890a8
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 6 deletions.
diff --git a/src/Gui/CommandFeat.cpp b/src/Gui/CommandFeat.cpp
@@ -25,8 +25,9 @@
 #ifndef _PreComp_
 #endif
 
-#include <App/DocumentObject.h>
+#include <App/DocumentObjectGroup.h>
 #include <App/GroupExtension.h>
+#include <App/Part.h>
 #include "Application.h"
 #include "CommandT.h"
 #include "DockWindowManager.h"
@@ -116,6 +117,10 @@ void StdCmdRandomColor::activated(int iMsg)
         }
     };
 
+    auto allowToChangeColor = [](const App::DocumentObject* obj) {
+        return (obj->isDerivedFrom<App::Part>() || obj->isDerivedFrom<App::DocumentObjectGroup>());
+    };
+
     // get the complete selection
     std::vector<SelectionSingleton::SelObj> sel = Selection().getCompleteSelection();
 
@@ -125,10 +130,12 @@ void StdCmdRandomColor::activated(int iMsg)
         setRandomColor(view);
 
         if (auto grp = it.pObject->getExtension<App::GroupExtension>()) {
-            std::vector<App::DocumentObject*> objs = grp->getObjects();
-            for (auto obj : objs) {
-                ViewProvider* view = Application::Instance->getViewProvider(obj);
-                setRandomColor(view);
+            if (allowToChangeColor(it.pObject)) {
+                std::vector<App::DocumentObject*> objs = grp->getObjects();
+                for (auto obj : objs) {
+                    ViewProvider* view = Application::Instance->getViewProvider(obj);
+                    setRandomColor(view);
+                }
             }
         }
     }

diff --git a/src/Mod/PartDesign/Gui/ViewProviderBody.cpp b/src/Mod/PartDesign/Gui/ViewProviderBody.cpp
@@ -427,7 +427,6 @@ void ViewProviderBody::unifyVisualProperty(const App::Property* prop) {
     if (prop == &Visibility ||
         prop == &Selectable ||
         prop == &DisplayModeBody ||
-        prop == &ShapeAppearance ||
         prop == &PointColorArray ||
         prop == &LineColorArray) {
         return;