Merge branch 'master' into asset-browser-grid-viewasset-browser-grid-view

1 files changed, 8 insertions, 3 deletions

diff --git a/source/blender/compositor/realtime_compositor/intern/context.cc b/source/blender/compositor/realtime_compositor/intern/context.cc
index 64ac29af3d1..0b123a2c271 100644
--- a/source/blender/compositor/realtime_compositor/intern/context.cc
+++ b/source/blender/compositor/realtime_compositor/intern/context.cc
@@ -1,6 +1,7 @@
 /* SPDX-License-Identifier: GPL-2.0-or-later */
 
 #include "COM_context.hh"
+#include "COM_static_cache_manager.hh"
 #include "COM_static_shader_manager.hh"
 #include "COM_texture_pool.hh"
 
@@ -17,9 +18,8 @@ int Context::get_frame_number() const
 
 float Context::get_time() const
 {
-  const float frame_number = static_cast<float>(get_frame_number());
-  const float frame_rate = static_cast<float>(get_scene()->r.frs_sec) /
-                           static_cast<float>(get_scene()->r.frs_sec_base);
+  const float frame_number = float(get_frame_number());
+  const float frame_rate = float(get_scene()->r.frs_sec) / float(get_scene()->r.frs_sec_base);
   return frame_number / frame_rate;
 }
 
@@ -33,4 +33,9 @@ StaticShaderManager &Context::shader_manager()
   return shader_manager_;
 }
 
+StaticCacheManager &Context::cache_manager()
+{
+  return cache_manager_;
+}
+
 }  // namespace blender::realtime_compositor