[Bf-blender-cvs] [75b53542f26] master: ImageEngine: Remove unneeded check for tiled image.

Jeroen Bakker noreply at git.blender.org
Wed Nov 24 11:02:07 CET 2021


Commit: 75b53542f2669d00caf2f98cfdbc9f1c91a6277f
Author: Jeroen Bakker
Date:   Wed Nov 24 11:00:06 2021 +0100
Branches: master
https://developer.blender.org/rB75b53542f2669d00caf2f98cfdbc9f1c91a6277f

ImageEngine: Remove unneeded check for tiled image.

Regular images are also tiled images, but with a default tile that leads
to the same result.

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

M	source/blender/draw/engines/image/image_drawing_mode.hh

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

diff --git a/source/blender/draw/engines/image/image_drawing_mode.hh b/source/blender/draw/engines/image/image_drawing_mode.hh
index d81b0971982..528e47b7a1e 100644
--- a/source/blender/draw/engines/image/image_drawing_mode.hh
+++ b/source/blender/draw/engines/image/image_drawing_mode.hh
@@ -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);
     }
   }



More information about the Bf-blender-cvs mailing list