[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [55734] trunk/blender/source/blender/imbuf /intern/colormanagement.c: Fix for potential missing draw-update when building without OCIO

Sergey Sharybin sergey.vfx at gmail.com
Tue Apr 2 19:39:35 CEST 2013


Revision: 55734
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=55734
Author:   nazgul
Date:     2013-04-02 17:39:34 +0000 (Tue, 02 Apr 2013)
Log Message:
-----------
Fix for potential missing draw-update when building without OCIO

Modified Paths:
--------------
    trunk/blender/source/blender/imbuf/intern/colormanagement.c

Modified: trunk/blender/source/blender/imbuf/intern/colormanagement.c
===================================================================
--- trunk/blender/source/blender/imbuf/intern/colormanagement.c	2013-04-02 17:28:37 UTC (rev 55733)
+++ trunk/blender/source/blender/imbuf/intern/colormanagement.c	2013-04-02 17:39:34 UTC (rev 55734)
@@ -1847,10 +1847,10 @@
 	 */
 	BLI_lock_thread(LOCK_COLORMANAGE);
 
-	if (ibuf->rect_float && (ibuf->rect == NULL || (ibuf->userflags & IB_RECT_INVALID))) {
+	if (ibuf->rect_float && (ibuf->rect == NULL || (ibuf->userflags & (IB_DISPLAY_BUFFER_INVALID | IB_RECT_INVALID)))) {
 		IMB_rect_from_float(ibuf);
 
-		ibuf->userflags &= ~IB_RECT_INVALID;
+		ibuf->userflags &= ~(IB_RECT_INVALID | IB_DISPLAY_BUFFER_INVALID);
 	}
 
 	BLI_unlock_thread(LOCK_COLORMANAGE);




More information about the Bf-blender-cvs mailing list