[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [59617] trunk/blender/source/blender/ render/intern/source/pipeline.c: Fix #36598: blender render crash baking and then doing a full sample render.

[Brecht Van Lommel]

Revision: 59617
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=59617
Author:   blendix
Date:     2013-08-29 00:14:57 +0000 (Thu, 29 Aug 2013)
Log Message:
-----------
Fix #36598: blender render crash baking and then doing a full sample render.

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

Modified: trunk/blender/source/blender/render/intern/source/pipeline.c
===================================================================
--- trunk/blender/source/blender/render/intern/source/pipeline.c	2013-08-28 23:49:22 UTC (rev 59616)
+++ trunk/blender/source/blender/render/intern/source/pipeline.c	2013-08-29 00:14:57 UTC (rev 59617)
@@ -1752,6 +1752,7 @@
 	rectf = MEM_mapallocN(re->rectx * re->recty * sizeof(float) * 4, "fullsample rgba");
 	
 	for (sample = 0; sample < re->r.osa; sample++) {
+		Scene *sce;
 		Render *re1;
 		RenderResult rres;
 		int mask;
@@ -1763,9 +1764,11 @@
 		/* also function below assumes this */
 			
 		tag_scenes_for_render(re);
-		for (re1 = RenderGlobal.renderlist.first; re1; re1 = re1->next) {
-			if (re1->scene->id.flag & LIB_DOIT) {
-				if (re1->r.scemode & R_FULL_SAMPLE) {
+		for (sce = re->main->scene.first; sce; sce = sce->id.next) {
+			if (sce->id.flag & LIB_DOIT) {
+				re1 = RE_GetRender(sce->id.name);
+
+				if (re1 && (re1->r.scemode & R_FULL_SAMPLE)) {
 					if (sample) {
 						BLI_rw_mutex_lock(&re->resultmutex, THREAD_LOCK_WRITE);
 						render_result_exr_file_read(re1, sample);