blender
/
blender
136
406
Fork 590
Code Issues 6.2k Pull Requests 763 Projects 19 Wiki Activity

ImageEngine: Remove unneeded check for tiled image. 

Regular images are also tiled images, but with a default tile that leads
to the same result.
This commit is contained in:
Jeroen Bakker 2021-11-24 11:00:06 +01:00
parent 17770192fb
commit 75b53542f2
1 changed files with 7 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
source/blender/draw/engines/image/image_drawing_mode.hh
View File

@ -50,19 +50,13 @@ class DefaultDrawingMode : public AbstractDrawingMode {
GPUBatch *geom = DRW_cache_quad_get();
const bool is_tiled_texture = image && image->source == IMA_SRC_TILED;
if (is_tiled_texture) {
const float translate_x = image_mat[3][0];
const float translate_y = image_mat[3][1];
LISTBASE_FOREACH (ImageTile *, tile, &image->tiles) {
const int tile_x = ((tile->tile_number - 1001) % 10);
const int tile_y = ((tile->tile_number - 1001) / 10);
image_mat[3][0] = (float)tile_x + translate_x;
image_mat[3][1] = (float)tile_y + translate_y;
DRW_shgroup_call_obmat(grp, geom, image_mat);
}
}
else {
const float translate_x = image_mat[3][0];
const float translate_y = image_mat[3][1];
LISTBASE_FOREACH (ImageTile *, tile, &image->tiles) {
const int tile_x = ((tile->tile_number - 1001) % 10);
const int tile_y = ((tile->tile_number - 1001) / 10);
image_mat[3][0] = (float)tile_x + translate_x;
image_mat[3][1] = (float)tile_y + translate_y;
DRW_shgroup_call_obmat(grp, geom, image_mat);
}
}