Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergey Sharybin <sergey.vfx@gmail.com>2015-08-26 15:51:13 +0300
committerSergey Sharybin <sergey.vfx@gmail.com>2015-08-26 15:52:28 +0300
commit76df0ec93a217693c75ee2890ce498e2ab244e9e (patch)
tree6abc99c8db2e826a92305abbc551473638690fbe /source/blender/blenkernel/BKE_material.h
parentd33557c52e1ac221078c66d1b480fb3aaa3f6cd4 (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/BKE_material.h')
-rw-r--r--source/blender/blenkernel/BKE_material.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/blenkernel/BKE_material.h b/source/blender/blenkernel/BKE_material.h
index bbac607a3fd..a3c61f44ff2 100644
--- a/source/blender/blenkernel/BKE_material.h
+++ b/source/blender/blenkernel/BKE_material.h
@@ -98,7 +98,7 @@ void BKE_material_clear_id(struct ID *id, bool update_data);
/* rendering */
void init_render_material(struct Material *, int, float *);
-void init_render_materials(struct Main *, int, float *);
+void init_render_materials(struct Main *, int r_mode, float *amd, bool do_default_material);
void end_render_material(struct Material *);
void end_render_materials(struct Main *);