mirror of
https://github.com/yeicor-3d/yet-another-cad-viewer.git
synced 2025-12-19 22:24:17 +01:00
Merge pull request #241 from andyross/pos-list-fix
Don't add location-like objects to Compound()
This commit is contained in:
@@ -77,8 +77,8 @@ def get_shape(obj: CADLike, error: bool = True) -> Optional[CADCoreLike]:
|
|||||||
if len(shapes_raw_filtered) > 0: # Continue if we found at least one shape
|
if len(shapes_raw_filtered) > 0: # Continue if we found at least one shape
|
||||||
# Sorting is required to improve hashcode consistency
|
# Sorting is required to improve hashcode consistency
|
||||||
shapes_raw_filtered_sorted = sorted(shapes_raw_filtered, key=lambda x: _hashcode(x))
|
shapes_raw_filtered_sorted = sorted(shapes_raw_filtered, key=lambda x: _hashcode(x))
|
||||||
# Build a single compound shape
|
# Build a single compound shape (skip locations/axes here, they can't be in a Compound)
|
||||||
shapes_bd = [Compound(shape) for shape in shapes_raw_filtered_sorted if shape is not None]
|
shapes_bd = [Compound(shape) for shape in shapes_raw_filtered_sorted if shape is not None and not isinstance(shape, TopLoc_Location)]
|
||||||
return get_shape(Compound(shapes_bd), error)
|
return get_shape(Compound(shapes_bd), error)
|
||||||
except TypeError:
|
except TypeError:
|
||||||
pass
|
pass
|
||||||
|
|||||||
Reference in New Issue
Block a user