Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeroen Bakker <jeroen@blender.org>2022-02-14 13:00:30 +0300
committerJeroen Bakker <jeroen@blender.org>2022-02-14 13:00:30 +0300
commit48e2bf3638e1d96d8cbfbc74d29c347ccfcad576 (patch)
treed40cb6b120a2a0718f68199556760c4398461fd2 /source/blender/editors
parentefac4db166292229e4e2ab7afa6034d637893bd6 (diff)
parent1236d2aea8d55c7d98409fc76968bad297a53007 (diff)
Merge branch 'blender-v3.1-release'
Diffstat (limited to 'source/blender/editors')
-rw-r--r--source/blender/editors/render/render_opengl.cc2
-rw-r--r--source/blender/editors/space_image/image_edit.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/editors/render/render_opengl.cc b/source/blender/editors/render/render_opengl.cc
index af4003b0c14..1ca2b01a2cb 100644
--- a/source/blender/editors/render/render_opengl.cc
+++ b/source/blender/editors/render/render_opengl.cc
@@ -512,7 +512,7 @@ static void screen_opengl_render_apply(const bContext *C, OGLRender *oglrender)
ibuf->userflags |= IB_DISPLAY_BUFFER_INVALID;
}
BKE_image_release_ibuf(oglrender->ima, ibuf, lock);
- oglrender->ima->gpuflag |= IMA_GPU_REFRESH;
+ BKE_image_partial_update_mark_full_update(oglrender->ima);
if (oglrender->write_still) {
screen_opengl_render_write(oglrender);
diff --git a/source/blender/editors/space_image/image_edit.c b/source/blender/editors/space_image/image_edit.c
index 5c386856827..e851b99d3ba 100644
--- a/source/blender/editors/space_image/image_edit.c
+++ b/source/blender/editors/space_image/image_edit.c
@@ -388,7 +388,7 @@ bool ED_image_slot_cycle(struct Image *image, int direction)
}
if ((cur != image->render_slot)) {
- image->gpuflag |= IMA_GPU_REFRESH;
+ BKE_image_partial_update_mark_full_update(image);
}
return (cur != image->render_slot);
}