archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Image engine: Remove unused parameter.

Browse Source 
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.
This commit is contained in:
Jeroen Bakker
2022-01-28 11:23:22 +01:00
parent dcb7b3f9f7
commit be921a04f2
4 changed files with 4 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
source/blender/draw/engines/image/image_shader_params.hh
View File

@@ -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);
}
};

3
source/blender/draw/engines/image/image_space.hh
View File

@@ -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.

4
source/blender/draw/engines/image/image_space_image.hh
View File

@@ -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) {

4
source/blender/draw/engines/image/image_space_node.hh
View File

@@ -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 */