[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [27931] trunk/blender/source/blender/ render/intern/source/rendercore.c: Fix #21771: crash in render baking with image that can't be loaded.

[Brecht Van Lommel]

Revision: 27931
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=27931
Author:   blendix
Date:     2010-04-01 16:32:08 +0200 (Thu, 01 Apr 2010)

Log Message:
-----------
Fix #21771: crash in render baking with image that can't be loaded.

Modified Paths:
--------------
    trunk/blender/source/blender/render/intern/source/rendercore.c

Modified: trunk/blender/source/blender/render/intern/source/rendercore.c
===================================================================
--- trunk/blender/source/blender/render/intern/source/rendercore.c	2010-04-01 13:57:24 UTC (rev 27930)
+++ trunk/blender/source/blender/render/intern/source/rendercore.c	2010-04-01 14:32:08 UTC (rev 27931)
@@ -2636,10 +2636,11 @@
 	for(ima= G.main->image.first; ima; ima= ima->id.next) {
 		ImBuf *ibuf= BKE_image_get_ibuf(ima, NULL);
 		ima->id.flag |= LIB_DOIT;
-		if (ibuf)
+		if(ibuf) {
 			ibuf->userdata = NULL; /* use for masking if needed */
-		if(ibuf->rect_float)
-			ibuf->profile = IB_PROFILE_LINEAR_RGB;
+			if(ibuf->rect_float)
+				ibuf->profile = IB_PROFILE_LINEAR_RGB;
+		}
 	}
 	
 	BLI_init_threads(&threads, do_bake_thread, re->r.threads);
@@ -2686,7 +2687,11 @@
 	for(ima= G.main->image.first; ima; ima= ima->id.next) {
 		if((ima->id.flag & LIB_DOIT)==0) {
 			ImBuf *ibuf= BKE_image_get_ibuf(ima, NULL);
-			if (re->r.bake_filter) {
+
+			if(!ibuf)
+				continue;
+
+			if(re->r.bake_filter) {
 				if (usemask) {
 					/* extend the mask +2 pixels from the image,
 					 * this is so colors dont blend in from outside */
@@ -2716,6 +2721,7 @@
 					ibuf->userdata= NULL;
 				}
 			}
+
 			ibuf->userflags |= IB_BITMAPDIRTY;
 			if (ibuf->rect_float) IMB_rect_from_float(ibuf);
 		}