diff options
| author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2007-12-04 18:57:20 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2007-12-04 18:57:20 +0300 |
| commit | 1e1ee08edbc98e80f464f09c014939f1446ece38 (patch) | |
| tree | 172a0ead9752f7dc48b690604ef54557c5de3b7a /source/blender/src/meshtools.c | |
| parent | 43c7cb994e16a60b0b4463d112a06865142bdcb3 (diff) | |
Fix for bug #7859: texture render baking crash.
Diffstat (limited to 'source/blender/src/meshtools.c')
| -rw-r--r-- | source/blender/src/meshtools.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/src/meshtools.c b/source/blender/src/meshtools.c index 0def52179f6..2b5ec2006c1 100644 --- a/source/blender/src/meshtools.c +++ b/source/blender/src/meshtools.c @@ -1011,7 +1011,7 @@ void objects_bake_render(short event) 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 @@ void objects_bake_render(short event) 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 @@ void objects_bake_render(short event) 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; |