Merge remote-tracking branch 'origin/Beta_8.995' into Beta_8.995

2022-05-09 15:57:42 +03:00
parent df2727b911 411a9320e5
commit a53ec7ea75
107 changed files with 872 additions and 462 deletions
--- a/camlib.py
+++ b/camlib.py
@@ -1260,7 +1260,8 @@ class Geometry(object):

        geos = geos_polys
        try:
-            for ml in merged_lines:
+            w_geo = merged_lines.geoms if isinstance(merged_lines, (MultiPolygon, MultiLineString)) else merged_lines
+            for ml in w_geo:
                geos.append(ml)
        except TypeError:
            geos.append(merged_lines)