[Bf-blender-cvs] [5c6f1ff4276] temp-T98375-share-gpu-textures: Remove unused parameter.

[Jeroen Bakker]

Commit: 5c6f1ff427696dc17ef93d801b267a158beef447
Author: Jeroen Bakker
Date:   Mon May 30 13:31:53 2022 +0200
Branches: temp-T98375-share-gpu-textures
https://developer.blender.org/rB5c6f1ff427696dc17ef93d801b267a158beef447

Remove unused parameter.

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

M	release/datafiles/locale
M	release/scripts/addons
M	release/scripts/addons_contrib
M	source/blender/blenkernel/BKE_image.h
M	source/blender/blenkernel/intern/image_gpu.cc
M	source/blender/editors/space_view3d/view3d_draw.c

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

diff --git a/release/datafiles/locale b/release/datafiles/locale
index 647c85462d8..ebc3989630d 160000
--- a/release/datafiles/locale
+++ b/release/datafiles/locale
@@ -1 +1 @@
-Subproject commit 647c85462d87c3a9d3a189d28d72d1bd93f4d4a8
+Subproject commit ebc3989630d18afe00624fc5e4bae6cc0de7a260
diff --git a/release/scripts/addons b/release/scripts/addons
index d936e4c01fa..bcb71eea69a 160000
--- a/release/scripts/addons
+++ b/release/scripts/addons
@@ -1 +1 @@
-Subproject commit d936e4c01fa263a71a7d0665628ae621283b15ee
+Subproject commit bcb71eea69a7b83c44112a5872ccd67cae96ec6f
diff --git a/release/scripts/addons_contrib b/release/scripts/addons_contrib
index 61e45814503..61efd17f87b 160000
--- a/release/scripts/addons_contrib
+++ b/release/scripts/addons_contrib
@@ -1 +1 @@
-Subproject commit 61e45814503f51963c91c51aaf764612e7c5dc72
+Subproject commit 61efd17f87b45c3049091127a5619219f9d2a821
diff --git a/source/blender/blenkernel/BKE_image.h b/source/blender/blenkernel/BKE_image.h
index 8f617cce7f7..2767a496b48 100644
--- a/source/blender/blenkernel/BKE_image.h
+++ b/source/blender/blenkernel/BKE_image.h
@@ -293,7 +293,7 @@ void BKE_image_free_all_gputextures(struct Main *bmain);
  * Same as above but only free animated images.
  */
 void BKE_image_free_anim_gputextures(struct Main *bmain);
-void BKE_image_free_old_gputextures(struct Main *bmain);
+void BKE_image_free_old_gputextures();
 
 /**
  * Pack image to memory.
diff --git a/source/blender/blenkernel/intern/image_gpu.cc b/source/blender/blenkernel/intern/image_gpu.cc
index 4daa080d688..d0d9234f9ab 100644
--- a/source/blender/blenkernel/intern/image_gpu.cc
+++ b/source/blender/blenkernel/intern/image_gpu.cc
@@ -701,7 +701,7 @@ void BKE_image_free_gputextures(Image *ima)
 
 void BKE_image_free_all_gputextures(Main *UNUSED(bmain))
 {
-  blender::bke::image::gpu::g_texture_store.clear();
+  g_texture_store.clear();
 }
 
 void BKE_image_free_anim_gputextures(Main *bmain)
@@ -715,7 +715,7 @@ void BKE_image_free_anim_gputextures(Main *bmain)
   }
 }
 
-void BKE_image_free_old_gputextures(Main *UNUSED(bmain))
+void BKE_image_free_old_gputextures()
 {
 
   static int lasttime = 0;
@@ -736,8 +736,8 @@ void BKE_image_free_old_gputextures(Main *UNUSED(bmain))
 
   lasttime = ctime;
 
-  blender::bke::image::gpu::g_texture_store.remove_unused();
-  blender::bke::image::gpu::g_texture_store.reset_usage();
+  g_texture_store.remove_unused();
+  g_texture_store.reset_usage();
 }
 
 /** \} */
@@ -1021,7 +1021,7 @@ void BKE_image_update_gputexture_delayed(struct Image *ima,
 
 void BKE_image_paint_set_mipmap(bool mipmap)
 {
-  blender::bke::image::gpu::g_texture_store.set_mipmap(mipmap);
+  g_texture_store.set_mipmap(mipmap);
 }
 
 /** \} */
diff --git a/source/blender/editors/space_view3d/view3d_draw.c b/source/blender/editors/space_view3d/view3d_draw.c
index 5b068750d76..92ab06ca547 100644
--- a/source/blender/editors/space_view3d/view3d_draw.c
+++ b/source/blender/editors/space_view3d/view3d_draw.c
@@ -1563,7 +1563,7 @@ void view3d_main_region_draw(const bContext *C, ARegion *region)
 
   DRW_cache_free_old_subdiv();
   DRW_cache_free_old_batches(bmain);
-  BKE_image_free_old_gputextures(bmain);
+  BKE_image_free_old_gputextures();
   GPU_pass_cache_garbage_collect();
 
   /* No depth test for drawing action zones afterwards. */