Commit: 6d196b8f5e95b8f5e537f7b7910e313c27497a8b
Author: Erik
Date:   Mon Jun 20 20:12:44 2022 +0200
Branches: blender-v3.2-release
https://developer.blender.org/rB6d196b8f5e95b8f5e537f7b7910e313c27497a8b

Fix T94969: Crash in Volume to Mesh with 0 voxels

Checks if voxel amount or -size is <= 0 and if so, returns early.

Differential Revision: https://developer.blender.org/D15241

===================================================================

M       source/blender/nodes/geometry/nodes/node_geo_volume_to_mesh.cc

===================================================================

diff --git a/source/blender/nodes/geometry/nodes/node_geo_volume_to_mesh.cc 
b/source/blender/nodes/geometry/nodes/node_geo_volume_to_mesh.cc
index e5827c24320..f395b7ed440 100644
--- a/source/blender/nodes/geometry/nodes/node_geo_volume_to_mesh.cc
+++ b/source/blender/nodes/geometry/nodes/node_geo_volume_to_mesh.cc
@@ -151,6 +151,16 @@ static Mesh *create_mesh_from_volume(GeometrySet 
&geometry_set, GeoNodeExecParam
   }
 
   const bke::VolumeToMeshResolution resolution = get_resolution_param(params);
+
+  if (resolution.mode == VOLUME_TO_MESH_RESOLUTION_MODE_VOXEL_SIZE &&
+      resolution.settings.voxel_size <= 0.0f) {
+    return nullptr;
+  }
+  if (resolution.mode == VOLUME_TO_MESH_RESOLUTION_MODE_VOXEL_AMOUNT &&
+      resolution.settings.voxel_amount <= 0) {
+    return nullptr;
+  }
+
   const Main *bmain = DEG_get_bmain(params.depsgraph());
   BKE_volume_load(volume, bmain);

_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
List details, subscription details or unsubscribe:
https://lists.blender.org/mailman/listinfo/bf-blender-cvs

Reply via email to