blender
/
blender
128
395
Fork 567
Code Issues 6.2k Pull Requests 754 Projects 19 Wiki Activity

Fix: Nodes modifier ignores input value with new property missing 

An issue with the previous commit-- the default value of the type was
used instead of the property value when the "use_attribute" property
was missing.
This commit is contained in:
Hans Goudey 2021-09-16 21:54:14 -05:00
parent 8e21d528ca
commit 633c29fb7b
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
source/blender/modifiers/intern/MOD_nodes.cc
View File

@ -643,6 +643,7 @@ static void initialize_group_input(NodesModifierData &nmd,
if (!socket_type_has_attribute_toggle(socket)) {
init_socket_cpp_value_from_property(
*property, static_cast<eNodeSocketDatatype>(socket.type), r_value);
return;
}
const IDProperty *property_use_attribute = IDP_GetPropertyFromGroup(
@ -650,7 +651,8 @@ static void initialize_group_input(NodesModifierData &nmd,
const IDProperty *property_attribute_name = IDP_GetPropertyFromGroup(
nmd.settings.properties, (socket.identifier + attribute_name_suffix).c_str());
if (property_use_attribute == nullptr || property_attribute_name == nullptr) {
socket.typeinfo->get_geometry_nodes_cpp_value(socket, r_value);
init_socket_cpp_value_from_property(
*property, static_cast<eNodeSocketDatatype>(socket.type), r_value);
return;
}