[Bf-blender-cvs] [af5cc8cbd41] blender-v2.81-release: Fix T69644 / T68586: objects flag unsynced when drag hidden collections

Dalai Felinto noreply at git.blender.org
Tue Oct 15 03:46:04 CEST 2019


Commit: af5cc8cbd411fd83584dafac281dd10e5c65312a
Author: Dalai Felinto
Date:   Thu Oct 10 16:29:51 2019 -0300
Branches: blender-v2.81-release
https://developer.blender.org/rBaf5cc8cbd411fd83584dafac281dd10e5c65312a

Fix T69644 / T68586: objects flag unsynced when drag hidden collections

That would lead to crashes and other issues. The solution is not elegant
though, it involves resyncing all the collections again.

Differential Revision: https://developer.blender.org/D6043

===================================================================

M	source/blender/blenkernel/intern/collection.c

===================================================================

diff --git a/source/blender/blenkernel/intern/collection.c b/source/blender/blenkernel/intern/collection.c
index 931d248558d..68a38c94ff7 100644
--- a/source/blender/blenkernel/intern/collection.c
+++ b/source/blender/blenkernel/intern/collection.c
@@ -1305,6 +1305,9 @@ bool BKE_collection_move(Main *bmain,
 
   BLI_ghash_free(view_layer_hash, NULL, NULL);
 
+  /* We need to sync it again to pass the correct flags to the collections objects. */
+  BKE_main_collection_sync(bmain);
+
   return true;
 }



More information about the Bf-blender-cvs mailing list