[Bf-blender-cvs] [ed69fbadf73] tmp-workbench-rewrite2: Move get_dummy_gpu_materials to Instance

[Miguel Pozo]

Commit: ed69fbadf73dd091143b5c2bc42f25c448c61e2e
Author: Miguel Pozo
Date:   Mon Jan 9 17:25:11 2023 +0100
Branches: tmp-workbench-rewrite2
https://developer.blender.org/rBed69fbadf73dd091143b5c2bc42f25c448c61e2e

Move get_dummy_gpu_materials to Instance

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

M	source/blender/draw/engines/workbench/workbench_engine.cc

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

diff --git a/source/blender/draw/engines/workbench/workbench_engine.cc b/source/blender/draw/engines/workbench/workbench_engine.cc
index e10bcf872ae..c4115d996b4 100644
--- a/source/blender/draw/engines/workbench/workbench_engine.cc
+++ b/source/blender/draw/engines/workbench/workbench_engine.cc
@@ -19,8 +19,6 @@ namespace blender::workbench {
 
 using namespace draw;
 
-GPUMaterial **get_dummy_gpu_materials(int material_count);
-
 class Instance {
  public:
   SceneState scene_state;
@@ -36,6 +34,17 @@ class Instance {
   DofPass dof_ps;
   AntiAliasingPass anti_aliasing_ps;
 
+  /* An array of nullptr GPUMaterial pointers so we can call DRW_cache_object_surface_material_get.
+   * They never get actually used. */
+  Vector<GPUMaterial *> dummy_gpu_materials = {1, nullptr, {}};
+  GPUMaterial **get_dummy_gpu_materials(int material_count)
+  {
+    if (material_count > dummy_gpu_materials.size()) {
+      dummy_gpu_materials.resize(material_count, nullptr);
+    }
+    return dummy_gpu_materials.begin();
+  };
+
   void init(Object *camera_ob = nullptr)
   {
     scene_state.init(camera_ob);
@@ -365,18 +374,6 @@ class Instance {
   }
 };
 
-/* This returns an array of nullptr GPUMaterial pointers so we can call
- * DRW_cache_object_surface_material_get. They never get actually used.
- */
-GPUMaterial **get_dummy_gpu_materials(int material_count)
-{
-  static Vector<GPUMaterial *> dummy_gpu_materials(1, nullptr, {});
-  if (material_count > dummy_gpu_materials.size()) {
-    dummy_gpu_materials.resize(material_count, nullptr);
-  }
-  return dummy_gpu_materials.begin();
-};
-
 }  // namespace blender::workbench
 
 /* -------------------------------------------------------------------- */