diff options
author | Sergey Sharybin <sergey@blender.org> | 2022-02-28 12:57:12 +0300 |
---|---|---|
committer | Sergey Sharybin <sergey@blender.org> | 2022-02-28 12:57:12 +0300 |
commit | 6f23401e984ee5bad621109ff78eeb6850044fee (patch) | |
tree | df97bd27dda77bb77884b25fa8c320e8030e04f7 /source/blender/draw/engines | |
parent | 307d612404caa1ed3252d568b506353e07242296 (diff) | |
parent | 6bbf63f25195d97c2770470a973bafb35dda5e28 (diff) |
Merge branch 'blender-v3.1-release'
Diffstat (limited to 'source/blender/draw/engines')
-rw-r--r-- | source/blender/draw/engines/image/image_engine.cc | 1 | ||||
-rw-r--r-- | source/blender/draw/engines/overlay/shaders/paint_texture_frag.glsl | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/source/blender/draw/engines/image/image_engine.cc b/source/blender/draw/engines/image/image_engine.cc index 180e9601cbd..e972d21cda4 100644 --- a/source/blender/draw/engines/image/image_engine.cc +++ b/source/blender/draw/engines/image/image_engine.cc @@ -107,6 +107,7 @@ class ImageEngine { space->release_buffer(instance_data->image, image_buffer, lock); ImageUser *iuser = space->get_image_user(); + BKE_image_multiview_index(instance_data->image, iuser); drawing_mode.cache_image(vedata, instance_data->image, iuser); } diff --git a/source/blender/draw/engines/overlay/shaders/paint_texture_frag.glsl b/source/blender/draw/engines/overlay/shaders/paint_texture_frag.glsl index 4d0692039a4..ebaa898429d 100644 --- a/source/blender/draw/engines/overlay/shaders/paint_texture_frag.glsl +++ b/source/blender/draw/engines/overlay/shaders/paint_texture_frag.glsl @@ -15,7 +15,7 @@ void main() if (maskInvertStencil) { mask.rgb = 1.0 - mask.rgb; } - float mask_step = smoothstep(0, 3.0, mask.r + mask.g + mask.b); + float mask_step = smoothstep(0.0, 3.0, mask.r + mask.g + mask.b); mask.rgb *= maskColor; mask.a = mask_step * opacity; |