[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [49174] branches/soc-2011-tomato/source/ blender/blenkernel/intern/image.c: Correction to previous commit -- make sure float buffer is not being changed

[Sergey Sharybin]

Revision: 49174
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=49174
Author:   nazgul
Date:     2012-07-24 12:18:40 +0000 (Tue, 24 Jul 2012)
Log Message:
-----------
Correction to previous commit -- make sure float buffer is not being changed
while color management transformations are running.

Modified Paths:
--------------
    branches/soc-2011-tomato/source/blender/blenkernel/intern/image.c

Modified: branches/soc-2011-tomato/source/blender/blenkernel/intern/image.c
===================================================================
--- branches/soc-2011-tomato/source/blender/blenkernel/intern/image.c	2012-07-24 12:00:02 UTC (rev 49173)
+++ branches/soc-2011-tomato/source/blender/blenkernel/intern/image.c	2012-07-24 12:18:40 UTC (rev 49174)
@@ -2565,7 +2565,6 @@
 	if (ibuf->x != rres.rectx || ibuf->y != rres.recty || ibuf->rect_float != rectf) {
 		IMB_display_buffer_invalidate(ibuf);
 	}
-	BLI_unlock_thread(LOCK_COLORMANAGE);
 
 	ibuf->x = rres.rectx;
 	ibuf->y = rres.recty;
@@ -2602,6 +2601,8 @@
 		ibuf->flags &= ~IB_zbuffloat;
 	}
 
+	BLI_unlock_thread(LOCK_COLORMANAGE);
+
 	/* since its possible to access the buffer from the image directly, set the profile [#25073] */
 	ibuf->profile = (iuser->scene->r.color_mgt_flag & R_COLOR_MANAGEMENT) ? IB_PROFILE_LINEAR_RGB : IB_PROFILE_NONE;
 	ibuf->dither = dither;