blender
/
blender
136
406
Fork 589
Code Issues 6.2k Pull Requests 751 Projects 19 Wiki Activity

Fix T103850: Convex hull node crash with empty geometry components 

Avoid using components that can contain null pointer.
Getting attibute should avoid trying to do it for a null mesh.
This fix bypasses working with components.

Differential Revision: https://developer.blender.org/D16997
This commit is contained in:
Iliya Katueshenock 2023-01-13 15:44:29 -06:00 committed by Hans Goudey
parent b55b671955
commit e35053d369
Notes: blender-bot 2023-02-14 07:40:56 +01:00 
Referenced by issue #103850, Regression: Geometry Node: Crash: Empty meshes -> Join Geometry -> Convex Hull
1 changed files with 12 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
source/blender/nodes/geometry/nodes/node_geo_convex_hull.cc
View File

@ -143,10 +143,10 @@ static Mesh *compute_hull(const GeometrySet &geometry_set)
Span<float3> positions_span;
if (const MeshComponent *component = geometry_set.get_component_for_read<MeshComponent>()) {
if (const Mesh *mesh = geometry_set.get_mesh_for_read()) {
count++;
if (const VArray<float3> positions = component->attributes()->lookup<float3>(
"position", ATTR_DOMAIN_POINT)) {
if (const VArray<float3> positions = mesh->attributes().lookup<float3>("position",
ATTR_DOMAIN_POINT)) {
if (positions.is_span()) {
span_count++;
positions_span = positions.get_internal_span();
@ -155,11 +155,10 @@ static Mesh *compute_hull(const GeometrySet &geometry_set)
}
}
if (const PointCloudComponent *component =
geometry_set.get_component_for_read<PointCloudComponent>()) {
if (const PointCloud *points = geometry_set.get_pointcloud_for_read()) {
count++;
if (const VArray<float3> positions = component->attributes()->lookup<float3>(
"position", ATTR_DOMAIN_POINT)) {
if (const VArray<float3> positions = points->attributes().lookup<float3>("position",
ATTR_DOMAIN_POINT)) {
if (positions.is_span()) {
span_count++;
positions_span = positions.get_internal_span();
@ -189,18 +188,17 @@ static Mesh *compute_hull(const GeometrySet &geometry_set)
Array<float3> positions(total_num);
int offset = 0;
if (const MeshComponent *component = geometry_set.get_component_for_read<MeshComponent>()) {
if (const VArray<float3> varray = component->attributes()->lookup<float3>("position",
ATTR_DOMAIN_POINT)) {
if (const Mesh *mesh = geometry_set.get_mesh_for_read()) {
if (const VArray<float3> varray = mesh->attributes().lookup<float3>("position",
ATTR_DOMAIN_POINT)) {
varray.materialize(positions.as_mutable_span().slice(offset, varray.size()));
offset += varray.size();
}
}
if (const PointCloudComponent *component =
geometry_set.get_component_for_read<PointCloudComponent>()) {
if (const VArray<float3> varray = component->attributes()->lookup<float3>("position",
ATTR_DOMAIN_POINT)) {
if (const PointCloud *points = geometry_set.get_pointcloud_for_read()) {
if (const VArray<float3> varray = points->attributes().lookup<float3>("position",
ATTR_DOMAIN_POINT)) {
varray.materialize(positions.as_mutable_span().slice(offset, varray.size()));
offset += varray.size();
}