diff options
| author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2010-03-14 23:24:11 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2010-03-14 23:24:11 +0300 |
| commit | ed076d74ef3f0593971108511dc25e63cab7e829 (patch) | |
| tree | d52679de90117424affcfd5c106884f7696d4c79 /source/blender/editors/object/object_bake.c | |
| parent | 114f437837a4b1711c85f0a3e229df04f2d0420d (diff) | |
Rendering from 3d view in local view or with unlocked layer was not
working yet, now layer is passed along to render engine, changes quite
a few files because simple swapping trick no longer works with threading.
Diffstat (limited to 'source/blender/editors/object/object_bake.c')
| -rw-r--r-- | source/blender/editors/object/object_bake.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/editors/object/object_bake.c b/source/blender/editors/object/object_bake.c index a4f419cf996..9458614293f 100644 --- a/source/blender/editors/object/object_bake.c +++ b/source/blender/editors/object/object_bake.c @@ -203,7 +203,7 @@ static void bake_startjob(void *bkv, short *stop, short *do_update) RE_test_break_cb(bkr->re, NULL, thread_break); G.afbreek= 0; /* blender_test_break uses this global */ - RE_Database_Baking(bkr->re, scene, scene->r.bake_mode, bkr->actob); + RE_Database_Baking(bkr->re, scene, scene->r.bake_mode, bkr->actob, scene->lay); /* baking itself is threaded, cannot use test_break in threads. we also update optional imagewindow */ bkr->tot= RE_bake_shade_all_selected(bkr->re, scene->r.bake_mode, bkr->actob, bkr->do_update); @@ -301,7 +301,7 @@ static int bake_image_exec(bContext *C, wmOperator *op) RE_test_break_cb(bkr.re, NULL, thread_break); G.afbreek= 0; /* blender_test_break uses this global */ - RE_Database_Baking(bkr.re, scene, scene->r.bake_mode, (scene->r.bake_flag & R_BAKE_TO_ACTIVE)? OBACT: NULL); + RE_Database_Baking(bkr.re, scene, scene->r.bake_mode, (scene->r.bake_flag & R_BAKE_TO_ACTIVE)? OBACT: NULL, scene->lay); /* baking itself is threaded, cannot use test_break in threads */ BLI_init_threads(&threads, do_bake_render, 1); |