From 5dd3d3d8b1056909fdeb29ce034b591a54d73590 Mon Sep 17 00:00:00 2001 From: tarman3 Date: Sun, 16 Nov 2025 21:15:45 +0200 Subject: [PATCH 1/2] CAM: Engrave - Fix #22380 - duplicates --- src/Mod/CAM/Path/Op/Engrave.py | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/src/Mod/CAM/Path/Op/Engrave.py b/src/Mod/CAM/Path/Op/Engrave.py index 296132fd0b..672600fb8c 100644 --- a/src/Mod/CAM/Path/Op/Engrave.py +++ b/src/Mod/CAM/Path/Op/Engrave.py @@ -99,30 +99,31 @@ class ObjectEngrave(PathEngraveBase.ObjectOp): jobshapes = [] - if len(obj.Base) >= 1: # user has selected specific subelements + if obj.Base: + # user has selected specific subelements Path.Log.track(len(obj.Base)) - wires = [] for base, subs in obj.Base: edges = [] - basewires = [] + wires = [] for feature in subs: sub = base.Shape.getElement(feature) - if type(sub) == Part.Edge: + if isinstance(sub, Part.Edge): edges.append(sub) elif sub.Wires: - basewires.extend(sub.Wires) + wires.extend(sub.Wires) else: - basewires.append(Part.Wire(sub.Edges)) + wires.append(Part.Wire(sub.Edges)) - for edgelist in Part.sortEdges(edges): - basewires.append(Part.Wire(edgelist)) + for sortedEdges in Part.sortEdges(edges): + wires.append(Part.Wire(sortedEdges)) - wires.extend(basewires) jobshapes.append(Part.makeCompound(wires)) - elif len(obj.BaseShapes) > 0: # user added specific shapes + elif obj.BaseShapes: + # user added specific shapes jobshapes.extend([base.Shape for base in obj.BaseShapes]) else: + # process all objects in Job.Model.Group Path.Log.track(self.model) for base in self.model: Path.Log.track(base.Label) From c1b58d1e91616481d7263dfef685ee6576fb85ea Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Mon, 17 Nov 2025 17:42:26 +0000 Subject: [PATCH 2/2] [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --- src/Gui/ViewProviderGeometryObject.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/Gui/ViewProviderGeometryObject.cpp b/src/Gui/ViewProviderGeometryObject.cpp index 1ef6938154..9a371ca6f2 100644 --- a/src/Gui/ViewProviderGeometryObject.cpp +++ b/src/Gui/ViewProviderGeometryObject.cpp @@ -196,8 +196,7 @@ void ViewProviderGeometryObject::updateData(const App::Property* prop) App::Material defaultMaterial; auto material = geometry->getMaterialAppearance(); if ((ShapeAppearance.getSize() == 1) - && (ShapeAppearance[0] == defaultMaterial - || ShapeAppearance[0] == materialAppearance) + && (ShapeAppearance[0] == defaultMaterial || ShapeAppearance[0] == materialAppearance) && (material != defaultMaterial)) { ShapeAppearance.setValue(material); }