diff options
author | Hans Goudey <h.goudey@me.com> | 2020-09-01 20:35:14 +0300 |
---|---|---|
committer | Hans Goudey <h.goudey@me.com> | 2020-09-01 20:38:05 +0300 |
commit | baca8611e5fe4b3dcd6f5065fb125bc0a9d65934 (patch) | |
tree | bb1230387cd53b15f9621f10c4d0e5e2050b5580 /intern/cycles/render/bake.cpp | |
parent | 31705201dddebf7e3be5c4533b89f380aad1ede1 (diff) | |
parent | 2930d4fcea405985f2212c5f28c061af7c4849f8 (diff) |
Merge branch 'master' into active-fcurve-keyframeactive-fcurve-keyframe
Diffstat (limited to 'intern/cycles/render/bake.cpp')
-rw-r--r-- | intern/cycles/render/bake.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/intern/cycles/render/bake.cpp b/intern/cycles/render/bake.cpp index 6044182a51a..c00451e931f 100644 --- a/intern/cycles/render/bake.cpp +++ b/intern/cycles/render/bake.cpp @@ -97,17 +97,17 @@ void BakeManager::set(Scene *scene, type = type_; pass_filter = shader_type_to_pass_filter(type_, pass_filter_); - Pass::add(PASS_BAKE_PRIMITIVE, scene->film->passes); - Pass::add(PASS_BAKE_DIFFERENTIAL, scene->film->passes); + Pass::add(PASS_BAKE_PRIMITIVE, scene->passes); + Pass::add(PASS_BAKE_DIFFERENTIAL, scene->passes); if (type == SHADER_EVAL_UV) { /* force UV to be available */ - Pass::add(PASS_UV, scene->film->passes); + Pass::add(PASS_UV, scene->passes); } /* force use_light_pass to be true if we bake more than just colors */ if (pass_filter & ~BAKE_FILTER_COLOR) { - Pass::add(PASS_LIGHT, scene->film->passes); + Pass::add(PASS_LIGHT, scene->passes); } /* create device and update scene */ |