[Bf-blender-cvs] [522dcc54af3] master: Fix T94969: Crash in Volume to Mesh with 0 voxels
Erik
noreply at git.blender.org
Mon Jun 20 20:13:44 CEST 2022
Commit: 522dcc54af3564d30cf0db3ec277a14c6c7046e6
Author: Erik
Date: Mon Jun 20 20:12:44 2022 +0200
Branches: master
https://developer.blender.org/rB522dcc54af3564d30cf0db3ec277a14c6c7046e6
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 8770fa2b74b..e1d1c67b8c8 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
@@ -153,6 +153,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);
More information about the Bf-blender-cvs
mailing list