[Bf-blender-cvs] [9a386d9c022] geometry-nodes-mix-attributes: fix

Jacques Lucke noreply at git.blender.org
Tue Dec 1 16:08:26 CET 2020


Commit: 9a386d9c0228a5f178ea8549387ad2e2a216e209
Author: Jacques Lucke
Date:   Tue Dec 1 14:57:03 2020 +0100
Branches: geometry-nodes-mix-attributes
https://developer.blender.org/rB9a386d9c0228a5f178ea8549387ad2e2a216e209

fix

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

M	source/blender/makesrna/intern/rna_nodetree.c

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

diff --git a/source/blender/makesrna/intern/rna_nodetree.c b/source/blender/makesrna/intern/rna_nodetree.c
index 75716bd60a2..2f9ba0c2d12 100644
--- a/source/blender/makesrna/intern/rna_nodetree.c
+++ b/source/blender/makesrna/intern/rna_nodetree.c
@@ -1899,10 +1899,8 @@ static bool mix_attributes_blend_mode_supported(const EnumPropertyItem *item)
 {
   return ELEM(item->value, MA_RAMP_BLEND, MA_RAMP_ADD, MA_RAMP_SUB) && item->identifier[0] != '\0';
 }
-static bool rna_GeometryNodeMixAttributes_operation_itemf(bContext *UNUSED(C),
-                                                          PointerRNA *UNUSED(ptr),
-                                                          PropertyRNA *UNUSED(prop),
-                                                          bool *r_free)
+static const EnumPropertyItem *rna_GeometryNodeMixAttributes_operation_itemf(
+    bContext *UNUSED(C), PointerRNA *UNUSED(ptr), PropertyRNA *UNUSED(prop), bool *r_free)
 {
   *r_free = true;
   return itemf_function_check(rna_enum_ramp_blend_items, mix_attributes_blend_mode_supported);



More information about the Bf-blender-cvs mailing list