[Bf-blender-cvs] [c106ed8fcd1] temp-geometry-nodes-fields-prototype: fix

Jacques Lucke noreply at git.blender.org
Fri Jul 30 17:16:11 CEST 2021


Commit: c106ed8fcd1b4723abfae73a82b95ed65255506c
Author: Jacques Lucke
Date:   Fri Jul 30 15:22:03 2021 +0200
Branches: temp-geometry-nodes-fields-prototype
https://developer.blender.org/rBc106ed8fcd1b4723abfae73a82b95ed65255506c

fix

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

M	source/blender/modifiers/intern/MOD_nodes.cc

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

diff --git a/source/blender/modifiers/intern/MOD_nodes.cc b/source/blender/modifiers/intern/MOD_nodes.cc
index c4908f9afd3..649b051ccd0 100644
--- a/source/blender/modifiers/intern/MOD_nodes.cc
+++ b/source/blender/modifiers/intern/MOD_nodes.cc
@@ -787,7 +787,8 @@ static void initialize_group_input(NodesModifierData &nmd,
     return;
   }
   const bool use_attribute = IDP_Int(property_use_attribute) != 0;
-  if (use_attribute) {
+  if (use_attribute &&
+      ELEM(socket.type, SOCK_FLOAT, SOCK_VECTOR, SOCK_RGBA, SOCK_INT, SOCK_BOOLEAN)) {
     const char *attribute_name = IDP_String(property_attribute_name);
     blender::bke::FieldPtr attribute_field = new blender::bke::PersistentAttributeField(
         attribute_name, *socket.typeinfo->get_base_cpp_type());
@@ -1178,7 +1179,11 @@ static void draw_property_for_socket(uiLayout *layout,
       uiItemPointerR(layout, md_ptr, rna_path, bmain_ptr, "textures", socket.name, ICON_TEXTURE);
       break;
     }
-    default: {
+    case SOCK_FLOAT:
+    case SOCK_VECTOR:
+    case SOCK_RGBA:
+    case SOCK_INT:
+    case SOCK_BOOLEAN: {
       uiLayout *col = uiLayoutColumn(layout, false);
       const int use_attribute = RNA_int_get(md_ptr, rna_path_use_attribute) != 0;
       if (use_attribute) {
@@ -1188,6 +1193,11 @@ static void draw_property_for_socket(uiLayout *layout,
         uiItemR(col, md_ptr, rna_path, 0, socket.name, ICON_NONE);
       }
       uiItemR(col, md_ptr, rna_path_use_attribute, 0, "Use Attribute", ICON_NONE);
+      break;
+    }
+    default: {
+      uiItemR(layout, md_ptr, rna_path, 0, socket.name, ICON_NONE);
+      break;
     }
   }
 }



More information about the Bf-blender-cvs mailing list