[Bf-blender-cvs] [2343d97cf24] geometry-nodes-mix-attributes: enable all blend modes

[Jacques Lucke]

Commit: 2343d97cf248c6ebf5a25b4a8d1e39e49bbf096a
Author: Jacques Lucke
Date:   Tue Dec 1 16:13:54 2020 +0100
Branches: geometry-nodes-mix-attributes
https://developer.blender.org/rB2343d97cf248c6ebf5a25b4a8d1e39e49bbf096a

enable all blend modes

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

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 2f9ba0c2d12..4f1ddebccb9 100644
--- a/source/blender/makesrna/intern/rna_nodetree.c
+++ b/source/blender/makesrna/intern/rna_nodetree.c
@@ -1895,17 +1895,6 @@ static const EnumPropertyItem *rna_GeometryNodeAttributeMath_operation_itemf(
   return itemf_function_check(rna_enum_node_math_items, attribute_math_operation_supported);
 }
 
-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 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);
-}
-
 static StructRNA *rna_ShaderNode_register(Main *bmain,
                                           ReportList *reports,
                                           void *data,
@@ -8386,7 +8375,6 @@ static void def_geo_mix_attributes(StructRNA *srna)
   prop = RNA_def_property(srna, "blend_type", PROP_ENUM, PROP_NONE);
   RNA_def_property_enum_sdna(prop, NULL, "custom1");
   RNA_def_property_enum_items(prop, rna_enum_ramp_blend_items);
-  RNA_def_property_enum_funcs(prop, NULL, NULL, "rna_GeometryNodeMixAttributes_operation_itemf");
   RNA_def_property_enum_default(prop, MA_RAMP_BLEND);
   RNA_def_property_ui_text(prop, "Blending Mode", "");
   RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_Node_update");