[Bf-blender-cvs] [cfc48a02195] uuid-undo-experiments: Merge branch 'master' into uuid-undo-experiments

[Bastien Montagne]

Commit: cfc48a0219507a726539e22d4c25d4aa9e5369c2
Author: Bastien Montagne
Date:   Wed Mar 11 16:54:46 2020 +0100
Branches: uuid-undo-experiments
https://developer.blender.org/rBcfc48a0219507a726539e22d4c25d4aa9e5369c2

Merge branch 'master' into uuid-undo-experiments

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



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

diff --cc source/blender/blenkernel/intern/scene.c
index a33b73a2ec5,027933e17c6..9c97844e894
--- a/source/blender/blenkernel/intern/scene.c
+++ b/source/blender/blenkernel/intern/scene.c
@@@ -2057,13 -2057,17 +2057,21 @@@ void BKE_scene_free_depsgraph_hash(Scen
    scene->depsgraph_hash = NULL;
  }
  
+ void BKE_scene_free_view_layer_depsgraph(Scene *scene, ViewLayer *view_layer)
+ {
+   if (scene->depsgraph_hash != NULL) {
+     DepsgraphKey key = {view_layer};
+     BLI_ghash_remove(scene->depsgraph_hash, &key, depsgraph_key_free, depsgraph_key_value_free);
+   }
+ }
+ 
  /* Query depsgraph for a specific contexts. */
  
 -Depsgraph *BKE_scene_get_depsgraph(Main *bmain, Scene *scene, ViewLayer *view_layer, bool allocate)
 +static Depsgraph **scene_get_depsgraph_p(Main *bmain,
 +                                         Scene *scene,
 +                                         ViewLayer *view_layer,
 +                                         const bool allocate_ghash_entry,
 +                                         const bool allocate_depsgraph)
  {
    BLI_assert(scene != NULL);
    BLI_assert(view_layer != NULL);