blender
/
blender
136
412
Fork 596
Code Issues 6.3k Pull Requests 767 Projects 19 Wiki Activity

Fix #114993: Experimental GP3 domain in list without Face Corner #115005

Merged
Jacques Lucke merged 1 commits from mod_moder/blender:tmp_fix_split_to_instances_domain into main 2023-11-16 18:29:43 +01:00
Conversation 0 Commits 1 Files Changed 3 +15 -1
3 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
source/blender/nodes/geometry/node_geometry_util.cc
View File

@ -80,6 +80,17 @@ const EnumPropertyItem *domain_experimental_grease_pencil_version3_fn(bContext *
});
}
const EnumPropertyItem *domain_without_corner_experimental_grease_pencil_version3_fn(
bContext * /*C*/, PointerRNA * /*ptr*/, PropertyRNA * /*prop*/, bool *r_free)
{
*r_free = true;
return enum_items_filter(
rna_enum_attribute_domain_without_corner_items, [](const EnumPropertyItem &item) -> bool {
return (item.value == ATTR_DOMAIN_LAYER) ? U.experimental.use_grease_pencil_version3 :
true;
});
}
} // namespace enums
} // namespace blender::nodes

3
source/blender/nodes/geometry/node_geometry_util.hh
View File

@ -133,6 +133,9 @@ const EnumPropertyItem *domain_experimental_grease_pencil_version3_fn(bContext *
PropertyRNA * /*prop*/,
bool *r_free);
const EnumPropertyItem *domain_without_corner_experimental_grease_pencil_version3_fn(
bContext * /*C*/, PointerRNA * /*ptr*/, PropertyRNA * /*prop*/, bool *r_free);
} // namespace enums
} // namespace blender::nodes

2
source/blender/nodes/geometry/nodes/node_geo_split_to_instances.cc
View File

@ -363,7 +363,7 @@ static void node_rna(StructRNA *srna)
rna_enum_attribute_domain_without_corner_items,
NOD_inline_enum_accessors(custom1),
ATTR_DOMAIN_POINT,
enums::domain_experimental_grease_pencil_version3_fn);
enums::domain_without_corner_experimental_grease_pencil_version3_fn);
}
static void node_register()