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/blenkernel/intern/material.c | |
| 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/blenkernel/intern/material.c')
| -rw-r--r-- | source/blender/blenkernel/intern/material.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/source/blender/blenkernel/intern/material.c b/source/blender/blenkernel/intern/material.c index dd69de4877f..fa0d34b8db6 100644 --- a/source/blender/blenkernel/intern/material.c +++ b/source/blender/blenkernel/intern/material.c @@ -1132,7 +1132,7 @@ void init_render_material(Material *mat, int r_mode, float *amb) } } -void init_render_materials(Main *bmain, int r_mode, float *amb) +void init_render_materials(Main *bmain, int r_mode, float *amb, bool do_default_material) { Material *ma; @@ -1153,8 +1153,10 @@ void init_render_materials(Main *bmain, int r_mode, float *amb) if (ma->id.us) init_render_material(ma, r_mode, amb); } - - init_render_material(&defmaterial, r_mode, amb); + + if (do_default_material) { + init_render_material(&defmaterial, r_mode, amb); + } } /* only needed for nodes now */ |