diff options
author | Dalai Felinto <dalai@blender.org> | 2021-01-29 00:59:18 +0300 |
---|---|---|
committer | Dalai Felinto <dalai@blender.org> | 2021-01-29 00:59:18 +0300 |
commit | 323b7ad9cd447d57f2e33aae937fb3265b9f5475 (patch) | |
tree | 2e9d2935ff485149e0a83175e3397d839a99fa27 /source/blender/makesrna/intern | |
parent | 7a62574338c3ddc8c83fcbf7f38cef4ec54bc5b8 (diff) | |
parent | 2f60e5d1b56dfb8c9104f4652e5cfa5914e58bd7 (diff) |
Merge remote-tracking branch 'origin/blender-v2.92-release'
Diffstat (limited to 'source/blender/makesrna/intern')
-rw-r--r-- | source/blender/makesrna/intern/rna_nodetree.c | 33 |
1 files changed, 17 insertions, 16 deletions
diff --git a/source/blender/makesrna/intern/rna_nodetree.c b/source/blender/makesrna/intern/rna_nodetree.c index a4dcc677035..a5a73d9d8ca 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 @@ -8870,6 +8854,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); |