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/editors/interface/interface_templates.c | |
| 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/editors/interface/interface_templates.c')
| -rw-r--r-- | source/blender/editors/interface/interface_templates.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/editors/interface/interface_templates.c b/source/blender/editors/interface/interface_templates.c index cb3d0923348..5813f1d090c 100644 --- a/source/blender/editors/interface/interface_templates.c +++ b/source/blender/editors/interface/interface_templates.c @@ -663,7 +663,7 @@ static void template_id_liboverride_hierarchy_create(bContext *C, * system override with reset. */ if (!ID_IS_LINKED(id) && ID_IS_OVERRIDE_LIBRARY(id)) { if (!ID_IS_OVERRIDE_LIBRARY_REAL(id)) { - BKE_lib_override_library_get(bmain, id, &id); + BKE_lib_override_library_get(bmain, id, NULL, &id); } if (id->override_library->flag & IDOVERRIDE_LIBRARY_FLAG_SYSTEM_DEFINED) { id->override_library->flag &= ~IDOVERRIDE_LIBRARY_FLAG_SYSTEM_DEFINED; |