[Bf-blender-cvs] [3b2522650bd] temp-geometry-nodes-fields-prototype: Don't show face corner domain in the geometry delete node

Hans Goudey noreply at git.blender.org
Tue Aug 3 18:56:34 CEST 2021


Commit: 3b2522650bd318ad8a7a4dc7e670478b3cb8e7fb
Author: Hans Goudey
Date:   Tue Aug 3 12:56:26 2021 -0400
Branches: temp-geometry-nodes-fields-prototype
https://developer.blender.org/rB3b2522650bd318ad8a7a4dc7e670478b3cb8e7fb

Don't show face corner domain in the geometry delete node

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

M	source/blender/makesrna/RNA_enum_types.h
M	source/blender/makesrna/intern/rna_attribute.c
M	source/blender/makesrna/intern/rna_nodetree.c

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

diff --git a/source/blender/makesrna/RNA_enum_types.h b/source/blender/makesrna/RNA_enum_types.h
index d544083a749..ddc83b7694c 100644
--- a/source/blender/makesrna/RNA_enum_types.h
+++ b/source/blender/makesrna/RNA_enum_types.h
@@ -241,6 +241,7 @@ extern const EnumPropertyItem rna_enum_attribute_type_items[];
 extern const EnumPropertyItem rna_enum_attribute_type_with_auto_items[];
 extern const EnumPropertyItem rna_enum_attribute_domain_items[];
 extern const EnumPropertyItem rna_enum_attribute_domain_with_auto_items[];
+extern const EnumPropertyItem rna_enum_attribute_domain_no_face_corner_items[];
 extern const EnumPropertyItem *rna_enum_attribute_domain_itemf(struct ID *id, bool *r_free);
 
 extern const EnumPropertyItem rna_enum_collection_color_items[];
diff --git a/source/blender/makesrna/intern/rna_attribute.c b/source/blender/makesrna/intern/rna_attribute.c
index b4ea70c33ab..6607bc594ce 100644
--- a/source/blender/makesrna/intern/rna_attribute.c
+++ b/source/blender/makesrna/intern/rna_attribute.c
@@ -75,6 +75,14 @@ const EnumPropertyItem rna_enum_attribute_domain_items[] = {
     {0, NULL, 0, NULL, NULL},
 };
 
+const EnumPropertyItem rna_enum_attribute_domain_no_face_corner_items[] = {
+    {ATTR_DOMAIN_POINT, "POINT", 0, "Point", "Attribute on point"},
+    {ATTR_DOMAIN_EDGE, "EDGE", 0, "Edge", "Attribute on mesh edge"},
+    {ATTR_DOMAIN_FACE, "FACE", 0, "Face", "Attribute on mesh faces"},
+    {ATTR_DOMAIN_CURVE, "CURVE", 0, "Spline", "Attribute on spline"},
+    {0, NULL, 0, NULL, NULL},
+};
+
 const EnumPropertyItem rna_enum_attribute_domain_with_auto_items[] = {
     {ATTR_DOMAIN_AUTO, "AUTO", 0, "Auto", ""},
     {ATTR_DOMAIN_POINT, "POINT", 0, "Point", "Attribute on point"},
diff --git a/source/blender/makesrna/intern/rna_nodetree.c b/source/blender/makesrna/intern/rna_nodetree.c
index 11108619b55..b7b2c19211b 100644
--- a/source/blender/makesrna/intern/rna_nodetree.c
+++ b/source/blender/makesrna/intern/rna_nodetree.c
@@ -9154,7 +9154,7 @@ static void def_geo_delete(StructRNA *srna)
 
   prop = RNA_def_property(srna, "domain", PROP_ENUM, PROP_NONE);
   RNA_def_property_enum_sdna(prop, NULL, "custom1");
-  RNA_def_property_enum_items(prop, rna_enum_attribute_domain_items);
+  RNA_def_property_enum_items(prop, rna_enum_attribute_domain_no_face_corner_items);
   RNA_def_property_enum_default(prop, ATTR_DOMAIN_POINT);
   RNA_def_property_ui_text(prop, "Domain", "");
   RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_Node_update");



More information about the Bf-blender-cvs mailing list