From 2f60e5d1b56dfb8c9104f4652e5cfa5914e58bd7 Mon Sep 17 00:00:00 2001 From: Dalai Felinto Date: Thu, 28 Jan 2021 22:44:20 +0100 Subject: Cleanup: Move geonodes object info RNA enum This enum is only used by the node. So it does not need to be declared outside the scope of its function. Originally I thought this may be relevant to the collection info node as well, but the patch for it is defining its own enums. --- source/blender/makesrna/intern/rna_nodetree.c | 33 ++++++++++++++------------- 1 file changed, 17 insertions(+), 16 deletions(-) diff --git a/source/blender/makesrna/intern/rna_nodetree.c b/source/blender/makesrna/intern/rna_nodetree.c index 1cd3593e4a4..5afc892820c 100644 --- a/source/blender/makesrna/intern/rna_nodetree.c +++ b/source/blender/makesrna/intern/rna_nodetree.c @@ -494,22 +494,6 @@ static const EnumPropertyItem rna_node_geometry_attribute_input_type_items_no_bo {0, NULL, 0, NULL, NULL}, }; -static const EnumPropertyItem rna_node_geometry_object_info_transform_space_items[] = { - {GEO_NODE_TRANSFORM_SPACE_ORIGINAL, - "ORIGINAL", - 0, - "Original", - "Output the geometry relative to the input object transform, and the location, rotation and " - "scale relative to the world origin"}, - {GEO_NODE_TRANSFORM_SPACE_RELATIVE, - "RELATIVE", - 0, - "Relative", - "Bring the input object geometry, location, rotation and scale into the modified object, " - "maintaining the relative position between the two objects in the scene"}, - {0, NULL, 0, NULL, NULL}, -}; - #endif #undef ITEM_ATTRIBUTE @@ -8866,6 +8850,23 @@ static void def_geo_object_info(StructRNA *srna) { PropertyRNA *prop; + static const EnumPropertyItem rna_node_geometry_object_info_transform_space_items[] = { + {GEO_NODE_TRANSFORM_SPACE_ORIGINAL, + "ORIGINAL", + 0, + "Original", + "Output the geometry relative to the input object transform, and the location, rotation " + "and " + "scale relative to the world origin"}, + {GEO_NODE_TRANSFORM_SPACE_RELATIVE, + "RELATIVE", + 0, + "Relative", + "Bring the input object geometry, location, rotation and scale into the modified object, " + "maintaining the relative position between the two objects in the scene"}, + {0, NULL, 0, NULL, NULL}, + }; + RNA_def_struct_sdna_from(srna, "NodeGeometryObjectInfo", "storage"); prop = RNA_def_property(srna, "transform_space", PROP_ENUM, PROP_NONE); -- cgit v1.2.3