Hotfix v1.2.4: Fix TreeFactory(season='winter'), fix join_objects ign…

…oring empty meshes
princeton-vl · Mar 5, 2024 · 331b4e5 · 331b4e5
1 parent 66a4493
commit 331b4e5
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 2 deletions.
diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md
@@ -22,4 +22,7 @@ v1.1.0
 - Add unit tests
 
 v1.2.0
-- Integrate OcMesher terrain option - see https://github.com/princeton-vl/OcMesher
+- Integrate OcMesher terrain option - see https://github.com/princeton-vl/OcMesher
+
+v1.2.4
+- Fix TreeFactory crash for season='winter'
diff --git a/infinigen/__init__.py b/infinigen/__init__.py
@@ -1,3 +1,3 @@
 import logging
 
-__version__ = "1.2.3"
+__version__ = "1.2.4"
diff --git a/infinigen/core/util/blender.py b/infinigen/core/util/blender.py
@@ -553,6 +553,10 @@ def join_objects(objs, check_attributes=False):
                 else:
                     join_target.data.attributes.new(att.name, att.data_type, att.domain)
 
+    empty_objs = [o for o in objs if len(o.data.vertices) == 0]
+    objs = [o for o in objs if len(o.data.vertices) > 0]
+    delete(empty_objs)
+
     select(objs)
     bpy.context.view_layer.objects.active = objs[0]
     bpy.ops.object.join()