Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHans Goudey <h.goudey@me.com>2020-09-14 17:47:22 +0300
committerHans Goudey <h.goudey@me.com>2020-09-14 17:47:22 +0300
commit3eae5f71d15e35f789996c185241275edd3125fa (patch)
tree6f05f1e4e640b3c8376986fe951b36a140e4fa58 /source/blender/draw/tests/shaders_test.cc
parent2dd0161860227394c3aec95e35d7cb75f5543884 (diff)
parent716ea15479895e56eb9f6d973aca88a5436d7efe (diff)
Merge branch 'master' into property-search-button-label-pointer
Diffstat (limited to 'source/blender/draw/tests/shaders_test.cc')
-rw-r--r--source/blender/draw/tests/shaders_test.cc3
1 files changed, 2 insertions, 1 deletions
diff --git a/source/blender/draw/tests/shaders_test.cc b/source/blender/draw/tests/shaders_test.cc
index 8feccc9588e..f99fa04ce75 100644
--- a/source/blender/draw/tests/shaders_test.cc
+++ b/source/blender/draw/tests/shaders_test.cc
@@ -156,7 +156,8 @@ TEST_F(DrawTest, image_glsl_shaders)
{
IMAGE_shader_library_ensure();
- EXPECT_NE(IMAGE_shader_image_get(), nullptr);
+ EXPECT_NE(IMAGE_shader_image_get(false), nullptr);
+ EXPECT_NE(IMAGE_shader_image_get(true), nullptr);
IMAGE_shader_free();
}