Merge branch 'blender-v3.0-release'
This commit is contained in:
commit
7b436ead6b
|
@ -201,7 +201,7 @@ void version_node_socket_index_animdata(Main *bmain,
|
|||
|
||||
const int new_index = input_index + socket_index_offset;
|
||||
BKE_animdata_fix_paths_rename_all_ex(
|
||||
bmain, owner_id, rna_path_prefix, NULL, NULL, input_index, new_index, false);
|
||||
bmain, owner_id, rna_path_prefix, nullptr, nullptr, input_index, new_index, false);
|
||||
MEM_freeN(rna_path_prefix);
|
||||
MEM_freeN(node_name_escaped);
|
||||
}
|
||||
|
|
|
@ -56,7 +56,7 @@ void version_node_socket_index_animdata(
|
|||
Main *bmain,
|
||||
int node_tree_type, /* NTREE_....., e.g. NTREE_SHADER */
|
||||
int node_type, /* SH_NODE_..., e.g. SH_NODE_BSDF_PRINCIPLED */
|
||||
int socket_index_lowest_modified,
|
||||
int socket_index_orig,
|
||||
int socket_index_offset,
|
||||
int total_number_of_sockets);
|
||||
|
||||
|
|
Loading…
Reference in New Issue