[Bf-blender-cvs] [48360afb105] tmp-vulkan: Merge commit 'master@{3-months-ago}' into tmp-vulkan

[Jeroen Bakker]

Commit: 48360afb105299e80155fd994b8c06c6f5e917ff
Author: Jeroen Bakker
Date:   Mon Jun 28 12:37:05 2021 +0200
Branches: tmp-vulkan
https://developer.blender.org/rB48360afb105299e80155fd994b8c06c6f5e917ff

Merge commit 'master@{3-months-ago}' into tmp-vulkan

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



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

diff --cc source/blender/draw/tests/shaders_test.cc
index 427fcbf8fad,96d544fd855..dd147f1bd36
--- a/source/blender/draw/tests/shaders_test.cc
+++ b/source/blender/draw/tests/shaders_test.cc
@@@ -301,9 -286,8 +301,8 @@@ static void test_overlay_glsl_shaders(
    OVERLAY_shader_free();
  }
  
 -TEST_F(DrawTest, eevee_glsl_shaders_static)
 +static void test_eevee_glsl_shaders()
  {
-   EEVEE_shaders_lightprobe_shaders_init();
    EEVEE_shaders_material_shaders_init();
  
    EXPECT_NE(EEVEE_shaders_bloom_blit_get(false), nullptr);