griefith/test2
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Merge branch 'blender-v4.1-release'

Browse Source
This commit is contained in:
Jacques Lucke
2024-03-03 00:00:48 +01:00
parent 1756ccf809 e72bf54791
commit 10b5fe8897
4 changed files with 12 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
source/blender/makesrna/intern/rna_nodetree.cc
View File

@@ -2159,7 +2159,7 @@ void rna_Node_update(Main *bmain, Scene * /*scene*/, PointerRNA *ptr)
ED_node_tree_propagate_change(nullptr, bmain, ntree);
}
static void rna_Node_update_relations(Main *bmain, Scene *scene, PointerRNA *ptr)
void rna_Node_update_relations(Main *bmain, Scene *scene, PointerRNA *ptr)
{
rna_Node_update(bmain, scene, ptr);
DEG_relations_tag_update(bmain);

1
source/blender/nodes/NOD_rna_define.hh
View File

@@ -14,6 +14,7 @@
void rna_Node_update(Main *bmain, Scene *scene, PointerRNA *ptr);
void rna_Node_socket_update(Main *bmain, Scene *scene, PointerRNA *ptr);
void rna_Node_update_relations(Main *bmain, Scene *scne, PointerRNA *ptr);
namespace blender::nodes {

3
source/blender/nodes/geometry/nodes/node_geo_collection_info.cc
View File

@@ -160,7 +160,7 @@ static void node_rna(StructRNA *srna)
{0, nullptr, 0, nullptr, nullptr},
};
RNA_def_node_enum(
PropertyRNA *prop = RNA_def_node_enum(
srna,
"transform_space",
"Transform Space",
@@ -168,6 +168,7 @@ static void node_rna(StructRNA *srna)
rna_node_geometry_collection_info_transform_space_items,
NOD_storage_enum_accessors(transform_space),
GEO_NODE_TRANSFORM_SPACE_ORIGINAL);
RNA_def_property_update_runtime(prop, rna_Node_update_relations);
}
static void node_register()

15
source/blender/nodes/geometry/nodes/node_geo_object_info.cc
View File

@@ -126,13 +126,14 @@ static void node_rna(StructRNA *srna)
{0, nullptr, 0, nullptr, nullptr},
};
RNA_def_node_enum(srna,
"transform_space",
"Transform Space",
"The transformation of the vector and geometry outputs",
rna_node_geometry_object_info_transform_space_items,
NOD_storage_enum_accessors(transform_space),
GEO_NODE_TRANSFORM_SPACE_ORIGINAL);
PropertyRNA *prop = RNA_def_node_enum(srna,
"transform_space",
"Transform Space",
"The transformation of the vector and geometry outputs",
rna_node_geometry_object_info_transform_space_items,
NOD_storage_enum_accessors(transform_space),
GEO_NODE_TRANSFORM_SPACE_ORIGINAL);
RNA_def_property_update_runtime(prop, rna_Node_update_relations);
}
static void node_register()