- fixing an issue with not building the UI for the generated objects when running a script and then trying to enable/disable the plots

- attempting to add a feature in the text editors to autoselect all words in a document that are the same as the one that was clicked
- all the colors set in Preferences now have to be in the 8digits format RGBA (including the alpha channel as a suffix) - it is required to delete the current preferences files
This commit is contained in:
Marius Stanciu
2022-01-17 21:26:10 +02:00
committed by Marius
parent fd696b00a2
commit 2430158334
11 changed files with 117 additions and 44 deletions

View File

@@ -1584,8 +1584,9 @@ class GeometryObject(FlatCAMObj, Geometry):
geo_final.multigeo = True
try:
new_solid_geometry += deepcopy(geo_obj.solid_geometry)
new_solid_geometry += deepcopy(geo_obj.solid_geometry.geoms)
except Exception as e:
new_solid_geometry.append(geo_obj.solid_geometry)
log.error("GeometryObject.merge() --> %s" % str(e))
# find the tool_uid maximum value in the geo_final