[Bf-blender-cvs] [cd00f29061e] soc-2019-outliner: Merge branch 'master' into soc-2019-outliner

[Nathan Craddock]

Commit: cd00f29061e0e4a87f4cdeae83a6316c5e4d3ad6
Author: Nathan Craddock
Date:   Thu Jul 18 11:54:49 2019 -0600
Branches: soc-2019-outliner
https://developer.blender.org/rBcd00f29061e0e4a87f4cdeae83a6316c5e4d3ad6

Merge branch 'master' into soc-2019-outliner

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



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

diff --cc source/blender/blenkernel/intern/layer.c
index 37b91f66aaa,7dc04214ba5..4098a3d35e6
--- a/source/blender/blenkernel/intern/layer.c
+++ b/source/blender/blenkernel/intern/layer.c
@@@ -846,9 -811,14 +843,13 @@@ void BKE_layer_collection_sync(const Sc
    BLI_freelistN(&view_layer->object_bases);
    view_layer->object_bases = new_object_bases;
  
+   for (Base *base = view_layer->object_bases.first; base; base = base->next) {
+     BKE_base_eval_flags(base);
+   }
+ 
    /* Always set a valid active collection. */
    LayerCollection *active = view_layer->active_collection;
 -
 -  if (active && (active->flag & LAYER_COLLECTION_EXCLUDE)) {
 +  if (active && layer_collection_hidden(view_layer, active)) {
      BKE_layer_collection_activate_parent(view_layer, active);
    }
    else if (active == NULL) {