[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [55700] trunk/blender/source/blender/imbuf /intern/colormanagement.c: Fix for recent changes in IMB_display_buffer_acquire

Sergey Sharybin sergey.vfx at gmail.com
Mon Apr 1 14:22:52 CEST 2013


Revision: 55700
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=55700
Author:   nazgul
Date:     2013-04-01 12:22:52 +0000 (Mon, 01 Apr 2013)
Log Message:
-----------
Fix for recent changes in IMB_display_buffer_acquire

Do early out when ibuf has 4 channels only, allocate
4-channels display buffer.

So now we could always assume byte buffer is always
in RGBA format.

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-01 12:08:43 UTC (rev 55699)
+++ trunk/blender/source/blender/imbuf/intern/colormanagement.c	2013-04-01 12:22:52 UTC (rev 55700)
@@ -1895,7 +1895,7 @@
 		/* early out: no float buffer and byte buffer is already in display space,
 		 * let's just use if
 		 */
-		if (ibuf->rect_float == NULL && ibuf->rect_colorspace) {
+		if (ibuf->rect_float == NULL && ibuf->rect_colorspace && ibuf->channels == 4) {
 			if (is_ibuf_rect_in_display_space(ibuf, applied_view_settings, display_settings))
 				return (unsigned char *) ibuf->rect;
 		}




More information about the Bf-blender-cvs mailing list