[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [28436] trunk/blender/source/blender: Two bugfixes from the render branch:

[Brecht Van Lommel]

Revision: 28436
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=28436
Author:   blendix
Date:     2010-04-26 14:50:48 +0200 (Mon, 26 Apr 2010)

Log Message:
-----------
Two bugfixes from the render branch:
* Fix for FSA update while rendering fix, should set float rect to NULL.
* Fix for irradiance cache mutex unlock that got lost in code changes.

Modified Paths:
--------------
    trunk/blender/source/blender/blenkernel/intern/image.c
    trunk/blender/source/blender/blenlib/intern/threads.c

Modified: trunk/blender/source/blender/blenkernel/intern/image.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/image.c	2010-04-26 11:56:52 UTC (rev 28435)
+++ trunk/blender/source/blender/blenkernel/intern/image.c	2010-04-26 12:50:48 UTC (rev 28436)
@@ -1950,11 +1950,19 @@
 		ibuf->flags |= IB_rectfloat;
 		ibuf->channels= channels;
 	}
+	else {
+		ibuf->rect_float= NULL;
+		ibuf->flags &= ~IB_rectfloat;
+	}
 
 	if(rectz) {
 		ibuf->zbuf_float= rectz;
 		ibuf->flags |= IB_zbuffloat;
 	}
+	else {
+		ibuf->zbuf_float= NULL;
+		ibuf->flags &= ~IB_zbuffloat;
+	}
 
 	ibuf->dither= dither;
 

Modified: trunk/blender/source/blender/blenlib/intern/threads.c
===================================================================
--- trunk/blender/source/blender/blenlib/intern/threads.c	2010-04-26 11:56:52 UTC (rev 28435)
+++ trunk/blender/source/blender/blenlib/intern/threads.c	2010-04-26 12:50:48 UTC (rev 28436)
@@ -359,6 +359,8 @@
 		pthread_mutex_unlock(&_viewer_lock);
 	else if(type==LOCK_CUSTOM1)
 		pthread_mutex_unlock(&_custom1_lock);
+	else if(type==LOCK_RCACHE)
+		pthread_mutex_unlock(&_rcache_lock);
 	else if(type==LOCK_OPENGL)
 		pthread_mutex_unlock(&_opengl_lock);
 }