[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [12782] trunk/blender/source/blender/src/ meshtools.c:

[Brecht Van Lommel]

Revision: 12782
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=12782
Author:   blendix
Date:     2007-12-04 16:57:20 +0100 (Tue, 04 Dec 2007)

Log Message:
-----------

Fix for bug #7859: texture render baking crash.

Modified Paths:
--------------
    trunk/blender/source/blender/src/meshtools.c

Modified: trunk/blender/source/blender/src/meshtools.c
===================================================================
--- trunk/blender/source/blender/src/meshtools.c	2007-12-04 15:11:33 UTC (rev 12781)
+++ trunk/blender/source/blender/src/meshtools.c	2007-12-04 15:57:20 UTC (rev 12782)
@@ -1011,7 +1011,7 @@
 			prev_wo_amb_occ = (G.scene->world->mode & WO_AMB_OCC) != 0;
 			G.scene->world->mode |= WO_AMB_OCC;
 		}
-		if(event==RE_BAKE_AO || actob) {
+		if(event==RE_BAKE_AO || active) {
 			prev_r_raytrace = (G.scene->r.mode & R_RAYTRACE) != 0;
 			G.scene->r.mode |= R_RAYTRACE;
 		}
@@ -1029,7 +1029,7 @@
 		bkr.re= re;
 		bkr.event= event;
 		bkr.ready= 0;
-		bkr.actob= actob;
+		bkr.actob= (active)? actob: NULL;
 		BLI_insert_thread(&threads, &bkr);
 		
 		while(bkr.ready==0) {
@@ -1074,7 +1074,7 @@
 			if(prev_wo_amb_occ == 0)
 				G.scene->world->mode &= ~WO_AMB_OCC;
 
-		if(event==RE_BAKE_AO || actob)
+		if(event==RE_BAKE_AO || active)
 			if(prev_r_raytrace == 0)
 				G.scene->r.mode &= ~R_RAYTRACE;