tmaq
/
tornavis
1
0
Fork 0
Code Issues 2 Pull Requests 29 Packages Projects 24 Releases Wiki Activity

Fix (unreported) missing Viewlayer update in liboverride code. 

In post-processing of objects & collections after liboverrides creation,
viewlayer could be accessed while tagged as dirty, since the
object/collection hierarchy may be modified several times during this
process.
This commit is contained in:
Bastien Montagne 2023-12-06 17:11:56 +01:00
parent e06561a27a
commit d24a49da84
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
source/blender/blenkernel/intern/lib_override.cc
View File

@ -1402,6 +1402,10 @@ static void lib_override_library_create_post_process(Main *bmain,
ob_new->id.override_library->reference == &ob->id);
if (old_active_object == ob) {
BLI_assert(view_layer);
/* May have been tagged as dirty again in a previous iteration of this loop, e.g. if adding a
* liboverride object to a colleciton. */
BKE_view_layer_synced_ensure(scene, view_layer);
Base *basact = BKE_view_layer_base_find(view_layer, ob_new);
if (basact != nullptr) {
view_layer->basact = basact;