[Bf-blender-cvs] [50da3cfbd6b] temp-geometry-nodes-fields-prototype: Merge branch 'master' into temp-geometry-nodes-fields-prototype

[Jacques Lucke]

Commit: 50da3cfbd6b13e227c5416e3a21f7cf1c182ea6c
Author: Jacques Lucke
Date:   Mon Aug 2 10:39:37 2021 +0200
Branches: temp-geometry-nodes-fields-prototype
https://developer.blender.org/rB50da3cfbd6b13e227c5416e3a21f7cf1c182ea6c

Merge branch 'master' into temp-geometry-nodes-fields-prototype

===================================================================



===================================================================

diff --cc source/blender/modifiers/intern/MOD_nodes.cc
index 649b051ccd0,3853b345c14..3598057b7b0
--- a/source/blender/modifiers/intern/MOD_nodes.cc
+++ b/source/blender/modifiers/intern/MOD_nodes.cc
@@@ -773,12 -726,7 +773,13 @@@ static void initialize_group_input(Node
    }
    const IDProperty *property = IDP_GetPropertyFromGroup(nmd.settings.properties,
                                                          socket.identifier);
 -  if (property == nullptr) {
++
 +  const IDProperty *property_use_attribute = IDP_GetPropertyFromGroup(
 +      nmd.settings.properties, (socket.identifier + use_attribute_suffix).c_str());
 +  const IDProperty *property_attribute_name = IDP_GetPropertyFromGroup(
 +      nmd.settings.properties, (socket.identifier + attribute_name_suffix).c_str());
 +  if (property == nullptr || property_use_attribute == nullptr ||
 +      property_attribute_name == nullptr) {
      socket.typeinfo->get_geometry_nodes_cpp_value(socket, r_value);
      return;
    }