diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2015-08-26 15:51:13 +0300 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2015-08-26 15:52:28 +0300 |
| commit | 76df0ec93a217693c75ee2890ce498e2ab244e9e (patch) | |
| tree | 6abc99c8db2e826a92305abbc551473638690fbe /source/blender/render | |
| parent | d33557c52e1ac221078c66d1b480fb3aaa3f6cd4 (diff) | |
Fix T45631: Ambient update rendered bug
The issue was in fact caused by both preview and viewport renderers affecting
on the default material, conflicting with each other.
Preview render doesn't really need default material, so we can safely skip it's
initialization in the render pipeline for preview rendering.
Diffstat (limited to 'source/blender/render')
| -rw-r--r-- | source/blender/render/intern/source/convertblender.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/render/intern/source/convertblender.c b/source/blender/render/intern/source/convertblender.c index e6fd570d31d..ee28c3b286f 100644 --- a/source/blender/render/intern/source/convertblender.c +++ b/source/blender/render/intern/source/convertblender.c @@ -5210,7 +5210,7 @@ void RE_Database_FromScene(Render *re, Main *bmain, Scene *scene, unsigned int l /* still bad... doing all */ init_render_textures(re); copy_v3_v3(amb, &re->wrld.ambr); - init_render_materials(re->main, re->r.mode, amb); + init_render_materials(re->main, re->r.mode, amb, (re->r.scemode & R_BUTS_PREVIEW) == 0); set_node_shader_lamp_loop(shade_material_loop); /* MAKE RENDER DATA */ @@ -5941,7 +5941,7 @@ void RE_Database_Baking(Render *re, Main *bmain, Scene *scene, unsigned int lay, init_render_textures(re); copy_v3_v3(amb, &re->wrld.ambr); - init_render_materials(re->main, re->r.mode, amb); + init_render_materials(re->main, re->r.mode, amb, true); set_node_shader_lamp_loop(shade_material_loop); |