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
path: root/source
diff options
context:
space:
mode:
authorDalai Felinto <dfelinto@gmail.com>2014-05-07 01:17:21 +0400
committerDalai Felinto <dfelinto@gmail.com>2014-05-07 01:25:41 +0400
commit2c4ea2a11ed7e9724b7b5c736ed5ff5db1681662 (patch)
tree89424ef2974fd251a36a62e387cb9b5ea5cddc7c /source
parent20f7aaf6be0dc186f6551761693133bb562a5be1 (diff)
Bake API: fix T40054 - baked image update on uv/imag editor for linear/float/noncolor, ...
All image colorspaces should be displaying correctly in the UV/Image Editor. Viewport may still present an issue, but it was reported separately anyways (T40055) Patch reviewed (and corrected) by Sergey Sharybin
Diffstat (limited to 'source')
-rw-r--r--source/blender/editors/object/object_bake_api.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/source/blender/editors/object/object_bake_api.c b/source/blender/editors/object/object_bake_api.c
index 88deb084ca3..17f323b2452 100644
--- a/source/blender/editors/object/object_bake_api.c
+++ b/source/blender/editors/object/object_bake_api.c
@@ -170,7 +170,11 @@ static bool write_internal_bake_pixels(
if (margin > 0)
RE_bake_margin(ibuf, mask_buffer, margin);
- ibuf->userflags |= IB_BITMAPDIRTY;
+ ibuf->userflags |= IB_DISPLAY_BUFFER_INVALID | IB_BITMAPDIRTY;
+
+ if (ibuf->rect_float)
+ ibuf->userflags |= IB_RECT_INVALID;
+
BKE_image_release_ibuf(image, ibuf, NULL);
if (mask_buffer)