- fixed the Geometry object merge functionality

- fixed a message when renaming an object
2021-09-18 21:17:00 +03:00
parent 824fae3bcb
commit 81aa0d4ef5
3 changed files with 5 additions and 3 deletions
--- a/appObjects/FlatCAMGeometry.py
+++ b/appObjects/FlatCAMGeometry.py
@@ -1595,7 +1595,7 @@ class GeometryObject(FlatCAMObj, Geometry):

            # find tools that have the same tool_type and group them by tool_type
            for k, v in new_tools.items():
-                same_tool_type[v['tool_type']].append(k)
+                same_tool_type[v['data']['tools_mill_tool_shape']].append(k)

            # find the intersections in the above groups
            intersect_list = []