diff options
| author | Joseph Eagar <joeedh@gmail.com> | 2021-06-26 23:00:26 +0300 |
|---|---|---|
| committer | Joseph Eagar <joeedh@gmail.com> | 2021-06-26 23:00:26 +0300 |
| commit | 83c491f044db0072143801b03aded573ed7093f9 (patch) | |
| tree | 45376aedcded9033be0b795a205c42638c345ef9 /source/blender/draw/engines/image | |
| parent | 7ef7843ada944a5530ff4de812a5684e39809142 (diff) | |
| parent | abc62003314af2b39136bf43031590d4fbfb72df (diff) | |
Merge branch 'master' into temp_bmesh_multires
Diffstat (limited to 'source/blender/draw/engines/image')
| -rw-r--r-- | source/blender/draw/engines/image/shaders/engine_image_frag.glsl | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/draw/engines/image/shaders/engine_image_frag.glsl b/source/blender/draw/engines/image/shaders/engine_image_frag.glsl index 2bccf0d99b5..55a2f2a72f1 100644 --- a/source/blender/draw/engines/image/shaders/engine_image_frag.glsl +++ b/source/blender/draw/engines/image/shaders/engine_image_frag.glsl @@ -28,7 +28,7 @@ in vec2 uvs; out vec4 fragColor; #ifdef TILED_IMAGE -/* TODO(fclem): deduplicate code. */ +/* TODO(fclem): deduplicate code. */ bool node_tex_tile_lookup(inout vec3 co, sampler2DArray ima, sampler1DArray map) { vec2 tile_pos = floor(co.xy); |