[Bf-blender-cvs] [2c4ea2a] master: Bake API: fix T40054 - baked image update on uv/imag editor for linear/float/noncolor, ...

Dalai Felinto noreply at git.blender.org
Tue May 6 23:26:51 CEST 2014


Commit: 2c4ea2a11ed7e9724b7b5c736ed5ff5db1681662
Author: Dalai Felinto
Date:   Tue May 6 18:17:21 2014 -0300
https://developer.blender.org/rB2c4ea2a11ed7e9724b7b5c736ed5ff5db1681662

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

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

M	source/blender/editors/object/object_bake_api.c

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

diff --git a/source/blender/editors/object/object_bake_api.c b/source/blender/editors/object/object_bake_api.c
index 88deb08..17f323b 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)




More information about the Bf-blender-cvs mailing list