Revision: 50130
          
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=50130
Author:   nazgul
Date:     2012-08-22 16:45:09 +0000 (Wed, 22 Aug 2012)
Log Message:
-----------
Sequencer: fix crash caused by incorrect handling of color management on ImBuf 
duplicate

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

Modified: branches/soc-2011-tomato/source/blender/imbuf/intern/allocimbuf.c
===================================================================
--- branches/soc-2011-tomato/source/blender/imbuf/intern/allocimbuf.c   
2012-08-22 16:44:32 UTC (rev 50129)
+++ branches/soc-2011-tomato/source/blender/imbuf/intern/allocimbuf.c   
2012-08-22 16:45:09 UTC (rev 50130)
@@ -446,10 +446,11 @@
        /* for now don't duplicate metadata */
        tbuf.metadata = NULL;
 
+       tbuf.display_buffer_flags = NULL;
+       tbuf.colormanage_cache = NULL;
+
        *ibuf2 = tbuf;
 
-       IMB_colormanage_cache_free(ibuf2);
-
        return(ibuf2);
 }
 

_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs

Reply via email to