[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [48752] branches/soc-2011-tomato/source/ blender/imbuf/intern/colormanagement.c: Fixed issue with missed cache update when disabling movie clip channels

[Sergey Sharybin]

Revision: 48752
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=48752
Author:   nazgul
Date:     2012-07-09 11:13:40 +0000 (Mon, 09 Jul 2012)
Log Message:
-----------
Fixed issue with missed cache update when disabling movie clip channels

Modified Paths:
--------------
    branches/soc-2011-tomato/source/blender/imbuf/intern/colormanagement.c

Modified: branches/soc-2011-tomato/source/blender/imbuf/intern/colormanagement.c
===================================================================
--- branches/soc-2011-tomato/source/blender/imbuf/intern/colormanagement.c	2012-07-09 10:55:41 UTC (rev 48751)
+++ branches/soc-2011-tomato/source/blender/imbuf/intern/colormanagement.c	2012-07-09 11:13:40 UTC (rev 48752)
@@ -893,7 +893,7 @@
 		 * it's safe to suppose standard byte buffer is used for display
 		 */
 
-		if (!ibuf->rect)
+		if (ibuf->rect_float && (ibuf->rect == NULL || (ibuf->userflags & IB_RECT_INVALID)))
 			IMB_rect_from_float(ibuf);
 
 		return (unsigned char *) ibuf->rect;
@@ -942,9 +942,8 @@
 	(void) view_transform;
 	(void) display_settings;
 
-	if (!ibuf->rect) {
+	if (ibuf->rect_float && (ibuf->rect == NULL || (ibuf->userflags & IB_RECT_INVALID)))
 		IMB_rect_from_float(ibuf);
-	}
 
 	return (unsigned char*) ibuf->rect;
 #endif