[Bf-blender-cvs] [e285765a6bc] master: Fix incorrect RNA enum default

[Hans Goudey]

Commit: e285765a6bce68f664f37965e7bd5429d330bffc
Author: Hans Goudey
Date:   Wed Jan 27 12:48:10 2021 -0600
Branches: master
https://developer.blender.org/rBe285765a6bce68f664f37965e7bd5429d330bffc

Fix incorrect RNA enum default

Also another copy and paste error in the attribute compare node.

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

M       source/blender/makesrna/intern/rna_nodetree.c
M       source/blender/nodes/geometry/nodes/node_geo_attribute_compare.cc

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

diff --git a/source/blender/makesrna/intern/rna_nodetree.c 
b/source/blender/makesrna/intern/rna_nodetree.c
index da84d02a8c1..a4dcc677035 100644
--- a/source/blender/makesrna/intern/rna_nodetree.c
+++ b/source/blender/makesrna/intern/rna_nodetree.c
@@ -8689,7 +8689,7 @@ static void def_geo_attribute_attribute_compare(StructRNA 
*srna)
 
   prop = RNA_def_property(srna, "operation", PROP_ENUM, PROP_NONE);
   RNA_def_property_enum_items(prop, rna_enum_node_float_compare_items);
-  RNA_def_property_enum_default(prop, NODE_MATH_ADD);
+  RNA_def_property_enum_default(prop, NODE_FLOAT_COMPARE_GREATER_THAN);
   RNA_def_property_ui_text(prop, "Operation", "");
   RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_Node_socket_update");
 
diff --git a/source/blender/nodes/geometry/nodes/node_geo_attribute_compare.cc 
b/source/blender/nodes/geometry/nodes/node_geo_attribute_compare.cc
index 20a2b2127c2..194b062021d 100644
--- a/source/blender/nodes/geometry/nodes/node_geo_attribute_compare.cc
+++ b/source/blender/nodes/geometry/nodes/node_geo_attribute_compare.cc
@@ -51,7 +51,7 @@ static bNodeSocketTemplate geo_node_attribute_compare_out[] = 
{
 static void geo_node_attribute_compare_init(bNodeTree *UNUSED(tree), bNode 
*node)
 {
   NodeAttributeCompare *data = (NodeAttributeCompare 
*)MEM_callocN(sizeof(NodeAttributeCompare),
-                                                                   "attribute 
mix node");
+                                                                   __func__);
   data->operation = NODE_FLOAT_COMPARE_GREATER_THAN;
   data->input_type_a = GEO_NODE_ATTRIBUTE_INPUT_ATTRIBUTE;
   data->input_type_b = GEO_NODE_ATTRIBUTE_INPUT_ATTRIBUTE;

_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
https://lists.blender.org/mailman/listinfo/bf-blender-cvs