[Bf-blender-cvs] [087777f2b9b] blender-v2.92-release: Cleanup: accept const pointer for BKE_scene_get_depsgraph

[Brecht Van Lommel]

Commit: 087777f2b9b8c7cfc75458c6e6e714e92e2e2851
Author: Brecht Van Lommel
Date:   Fri Jan 29 15:48:14 2021 +0100
Branches: blender-v2.92-release
https://developer.blender.org/rB087777f2b9b8c7cfc75458c6e6e714e92e2e2851

Cleanup: accept const pointer for BKE_scene_get_depsgraph

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

M	source/blender/blenkernel/BKE_scene.h
M	source/blender/blenkernel/intern/scene.c

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

diff --git a/source/blender/blenkernel/BKE_scene.h b/source/blender/blenkernel/BKE_scene.h
index a3d40e093d9..b2726885593 100644
--- a/source/blender/blenkernel/BKE_scene.h
+++ b/source/blender/blenkernel/BKE_scene.h
@@ -223,7 +223,8 @@ void BKE_scene_free_depsgraph_hash(struct Scene *scene);
 void BKE_scene_free_view_layer_depsgraph(struct Scene *scene, struct ViewLayer *view_layer);
 
 /* Do not allocate new depsgraph. */
-struct Depsgraph *BKE_scene_get_depsgraph(struct Scene *scene, struct ViewLayer *view_layer);
+struct Depsgraph *BKE_scene_get_depsgraph(const struct Scene *scene,
+                                          const struct ViewLayer *view_layer);
 /* Allocate new depsgraph if necessary. */
 struct Depsgraph *BKE_scene_ensure_depsgraph(struct Main *bmain,
                                              struct Scene *scene,
diff --git a/source/blender/blenkernel/intern/scene.c b/source/blender/blenkernel/intern/scene.c
index 11cdf67cb82..f16d2ff7619 100644
--- a/source/blender/blenkernel/intern/scene.c
+++ b/source/blender/blenkernel/intern/scene.c
@@ -3436,10 +3436,13 @@ static Depsgraph **scene_ensure_depsgraph_p(Main *bmain, Scene *scene, ViewLayer
   return depsgraph_ptr;
 }
 
-Depsgraph *BKE_scene_get_depsgraph(Scene *scene, ViewLayer *view_layer)
+Depsgraph *BKE_scene_get_depsgraph(const Scene *scene, const ViewLayer *view_layer)
 {
-  Depsgraph **depsgraph_ptr = scene_get_depsgraph_p(scene, view_layer, false);
-  return (depsgraph_ptr != NULL) ? *depsgraph_ptr : NULL;
+  BLI_assert(BKE_scene_has_view_layer(scene, view_layer));
+
+  DepsgraphKey key;
+  key.view_layer = view_layer;
+  return BLI_ghash_lookup(scene->depsgraph_hash, &key);
 }
 
 Depsgraph *BKE_scene_ensure_depsgraph(Main *bmain, Scene *scene, ViewLayer *view_layer)