Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fix T92149: Crash in delete geometry node after curve fill node

Browse Source 
There was only a check for the component but not for if it was empty.
Because the curve fill node produces an empty curve component, a
nullptr was read, causing a crash. Generally nodes shouldn't produce
empty components, but currently we cannot rely on that fact.

Differential Revision: https://developer.blender.org/D12838
This commit is contained in:
Wannes Malfait
2021-10-12 10:58:38 -05:00
committed by Hans Goudey
parent 0c7e836a1d
commit 5e3877e0c8
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
source/blender/nodes/geometry/nodes/node_geo_delete_geometry.cc
View File

@@ -1156,19 +1156,19 @@ void separate_geometry(GeometrySet &geometry_set,
bool &r_is_error)
{
bool some_valid_domain = false;
if (geometry_set.has<PointCloudComponent>()) {
if (geometry_set.has_pointcloud()) {
if (domain == ATTR_DOMAIN_POINT) {
separate_point_cloud_selection(geometry_set, selection_field, invert);
some_valid_domain = true;
}
}
if (geometry_set.has<MeshComponent>()) {
if (geometry_set.has_mesh()) {
if (domain != ATTR_DOMAIN_CURVE) {
separate_mesh_selection(geometry_set, selection_field, domain, mode, invert);
some_valid_domain = true;
}
}
if (geometry_set.has<CurveComponent>()) {
if (geometry_set.has_curve()) {
if (ELEM(domain, ATTR_DOMAIN_POINT, ATTR_DOMAIN_CURVE)) {
separate_curve_selection(geometry_set, selection_field, domain, invert);
some_valid_domain = true;