Merge pull request #401 from howetuft/master

Fix skip meshing
FreeCAD · May 8, 2024 · 97e8b09 · 97e8b09
2 parents 04c7dfb + 8ca5611
commit 97e8b09
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 18 deletions.
diff --git a/Render/groundplane.py b/Render/groundplane.py
@@ -60,6 +60,7 @@ def __init__(self, project):
         self.Mesh = Mesh.Mesh()
         bbox = project.get_bounding_box()
         self.Document = project.fpo.Document
+        self.Placement = App.Placement()
 
         if bbox.isValid():
             zpos = project.fpo.GroundPlaneZ

diff --git a/Render/rdrhandler.py b/Render/rdrhandler.py
@@ -507,8 +507,9 @@ def mesher(
         rends = renderables.check_renderables(rends)
 
         # Rescale to meters
-        for rend in rends:
-            rend.mesh.convert_distances(SCALE)
+        if not self.skip_meshing:
+            for rend in rends:
+                rend.mesh.convert_distances(SCALE)
 
         # Call renderer on renderables, concatenate and return
         write_mesh = functools.partial(

diff --git a/Render/renderables.py b/Render/renderables.py
@@ -270,22 +270,21 @@ def check_renderables(renderables):
     result = []
     for renderable in renderables:
         mesh = renderable.mesh
-        if mesh.skip_meshing:
-            continue
-        if not mesh:
-            warn(
-                "Export",
-                renderable.name,
-                translate("Render", "Cannot find mesh data"),
-            )
-            continue
-        if not mesh.count_points or not mesh.count_facets:
-            warn(
-                "Export",
-                renderable.name,
-                translate("Render", "Mesh topology is empty"),
-            )
-            continue
+        if not mesh.skip_meshing:
+            if not mesh:
+                warn(
+                    "Export",
+                    renderable.name,
+                    translate("Render", "Cannot find mesh data"),
+                )
+                continue
+            if not mesh.count_points or not mesh.count_facets:
+                warn(
+                    "Export",
+                    renderable.name,
+                    translate("Render", "Mesh topology is empty"),
+                )
+                continue
         result.append(renderable)
     return result