diff options
author | Jeroen Bakker <jeroen@blender.org> | 2022-01-28 13:23:22 +0300 |
---|---|---|
committer | Jeroen Bakker <jeroen@blender.org> | 2022-01-28 13:48:47 +0300 |
commit | be921a04f24a4807682bfb9d1118bcce11c7b66a (patch) | |
tree | dee7607e4638b469046f62ffccc8c3edb9e61aa8 /source/blender | |
parent | dcb7b3f9f78484840edc60bc4cf711823b7eec17 (diff) |
Image engine: Remove unused parameter.
Parameter was used to still be compatible with the previous drawing mode.
The previous mode isn't available anymore so the parameter can should be
removed.
Diffstat (limited to 'source/blender')
4 files changed, 4 insertions, 10 deletions
diff --git a/source/blender/draw/engines/image/image_shader_params.hh b/source/blender/draw/engines/image/image_shader_params.hh index 3fcea696594..46371c598f3 100644 --- a/source/blender/draw/engines/image/image_shader_params.hh +++ b/source/blender/draw/engines/image/image_shader_params.hh @@ -54,7 +54,6 @@ struct ShaderParameters { Camera *camera = static_cast<Camera *>(scene->camera->data); copy_v2_fl2(far_near, camera->clip_end, camera->clip_start); } - const bool is_tiled_image = (image->source == IMA_SRC_TILED); - space->get_shader_parameters(*this, image_buffer, is_tiled_image); + space->get_shader_parameters(*this, image_buffer); } }; diff --git a/source/blender/draw/engines/image/image_space.hh b/source/blender/draw/engines/image/image_space.hh index 762f43a7337..29d9cd4340b 100644 --- a/source/blender/draw/engines/image/image_space.hh +++ b/source/blender/draw/engines/image/image_space.hh @@ -72,8 +72,7 @@ class AbstractSpaceAccessor { * are updated inside the image engine. */ virtual void get_shader_parameters(ShaderParameters &r_shader_parameters, - ImBuf *image_buffer, - bool is_tiled) = 0; + ImBuf *image_buffer) = 0; /** * Retrieve the gpu textures to draw. diff --git a/source/blender/draw/engines/image/image_space_image.hh b/source/blender/draw/engines/image/image_space_image.hh index 96abe2e57f4..090481a351d 100644 --- a/source/blender/draw/engines/image/image_space_image.hh +++ b/source/blender/draw/engines/image/image_space_image.hh @@ -54,9 +54,7 @@ class SpaceImageAccessor : public AbstractSpaceAccessor { ED_space_image_release_buffer(sima, image_buffer, lock); } - void get_shader_parameters(ShaderParameters &r_shader_parameters, - ImBuf *image_buffer, - bool UNUSED(is_tiled)) override + void get_shader_parameters(ShaderParameters &r_shader_parameters, ImBuf *image_buffer) override { const int sima_flag = sima->flag & ED_space_image_get_display_channel_mask(image_buffer); if ((sima_flag & SI_USE_ALPHA) != 0) { diff --git a/source/blender/draw/engines/image/image_space_node.hh b/source/blender/draw/engines/image/image_space_node.hh index 1ce8fdeb0f3..15eef8f6499 100644 --- a/source/blender/draw/engines/image/image_space_node.hh +++ b/source/blender/draw/engines/image/image_space_node.hh @@ -54,9 +54,7 @@ class SpaceNodeAccessor : public AbstractSpaceAccessor { BKE_image_release_ibuf(image, ibuf, lock); } - void get_shader_parameters(ShaderParameters &r_shader_parameters, - ImBuf *ibuf, - bool UNUSED(is_tiled)) override + void get_shader_parameters(ShaderParameters &r_shader_parameters, ImBuf *ibuf) override { if ((snode->flag & SNODE_USE_ALPHA) != 0) { /* Show RGBA */ |