diff options
author | Bastien Montagne <bastien@blender.org> | 2022-08-12 13:40:46 +0300 |
---|---|---|
committer | Bastien Montagne <bastien@blender.org> | 2022-08-12 13:40:46 +0300 |
commit | 74645d969b57b3cf6ca14ec7a218345aea311f16 (patch) | |
tree | 7868f499c56176c5d7bd57416ec29caf65e0de4d /source/blender/makesrna/intern/rna_path.cc | |
parent | 7f733e294d5485178df800685c69cc15547ee73c (diff) | |
parent | afd2e9ebc38a6182746707c6c6ba65ad7414d377 (diff) |
Merge branch 'blender-v3.3-release'
Conflicts:
source/blender/blenkernel/BKE_lib_override.h
Diffstat (limited to 'source/blender/makesrna/intern/rna_path.cc')
-rw-r--r-- | source/blender/makesrna/intern/rna_path.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/makesrna/intern/rna_path.cc b/source/blender/makesrna/intern/rna_path.cc index 5d570657b53..f14e2113e13 100644 --- a/source/blender/makesrna/intern/rna_path.cc +++ b/source/blender/makesrna/intern/rna_path.cc @@ -940,7 +940,7 @@ ID *RNA_find_real_ID_and_path(Main *bmain, ID *id, const char **r_path) BLI_assert_msg(0, "Missing handling of embedded id type."); return id; } - return id_type->owner_get(bmain, id); + return id_type->owner_get(bmain, id, nullptr); } static char *rna_prepend_real_ID_path(Main *bmain, ID *id, char *path, ID **r_real_id) |