Merge branch 'blender-v2.92-release'

1 files changed, 30 insertions, 0 deletions

diff --git a/source/blender/makesrna/intern/rna_nodetree.c b/source/blender/makesrna/intern/rna_nodetree.c
index a01f6b2db5d..6480b80056c 100644
--- a/source/blender/makesrna/intern/rna_nodetree.c
+++ b/source/blender/makesrna/intern/rna_nodetree.c
@@ -494,6 +494,22 @@ 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
@@ -8846,6 +8862,20 @@ static void def_geo_point_translate(StructRNA *srna)
   RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_Node_socket_update");
 }
 
+static void def_geo_object_info(StructRNA *srna)
+{
+  PropertyRNA *prop;
+
+  RNA_def_struct_sdna_from(srna, "NodeGeometryObjectInfo", "storage");
+
+  prop = RNA_def_property(srna, "transform_space", PROP_ENUM, PROP_NONE);
+  RNA_def_property_enum_items(prop, rna_node_geometry_object_info_transform_space_items);
+  RNA_def_property_ui_text(prop,
+                           "Transform Space",
+                           "Determine the transformation applied to vector and geometry outputs");
+  RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_Node_update");
+}
+
 /* -------------------------------------------------------------------------- */
 
 static void rna_def_shader_node(BlenderRNA *brna)