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:
authorBrecht Van Lommel <brechtvanlommel@gmail.com>2016-02-06 22:35:36 +0300
committerBrecht Van Lommel <brechtvanlommel@gmail.com>2016-02-06 23:02:02 +0300
commit7faa9d1304bc500185684a41f8bd65fb4893b8bb (patch)
tree02e6351c2be5955373bb9797a1b87f8d661e9599 /intern/cycles/render/bake.h
parentc502114ee11dcd2e737452944b652205517b5682 (diff)
Fix T46550: Cycles combined baking black in some cases.
Now pass_filter is modified to have exactly the flags for the light components that need to be baked, based on the shader type. This simplifies the logic.
Diffstat (limited to 'intern/cycles/render/bake.h')
-rw-r--r--intern/cycles/render/bake.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/intern/cycles/render/bake.h b/intern/cycles/render/bake.h
index b731b213065..8377e387197 100644
--- a/intern/cycles/render/bake.h
+++ b/intern/cycles/render/bake.h
@@ -68,7 +68,7 @@ public:
void device_update(Device *device, DeviceScene *dscene, Scene *scene, Progress& progress);
void device_free(Device *device, DeviceScene *dscene);
- static bool is_light_pass(ShaderEvalType type, const int pass_filter);
+ static int shader_type_to_pass_filter(ShaderEvalType type, const int pass_filter);
static bool is_aa_pass(ShaderEvalType type);
bool need_update;