diff options
author | Bastien Montagne <montagne29@wanadoo.fr> | 2018-01-24 14:14:59 +0300 |
---|---|---|
committer | Bastien Montagne <montagne29@wanadoo.fr> | 2018-01-24 14:14:59 +0300 |
commit | 6a65fc34565da167d686d0ea14f11f73f909d19d (patch) | |
tree | 22b2cbcc614278faa1d3847aafb4371453b2dcf9 /intern | |
parent | 752fc35fa15b6bfee0309354ffcbf5c78211e8a6 (diff) | |
parent | e68771fa8760035050f476895ebe791c4857f91b (diff) |
Merge branch 'master' into blender2.8
Conflicts:
source/blender/modifiers/intern/MOD_wireframe.c
Diffstat (limited to 'intern')
-rw-r--r-- | intern/cycles/render/film.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/intern/cycles/render/film.cpp b/intern/cycles/render/film.cpp index 97937ac5f81..b305f01095f 100644 --- a/intern/cycles/render/film.cpp +++ b/intern/cycles/render/film.cpp @@ -310,6 +310,7 @@ void Film::device_update(Device *device, DeviceScene *dscene, Scene *scene) /* update __data */ kfilm->exposure = exposure; kfilm->pass_flag = 0; + kfilm->light_pass_flag = 0; kfilm->pass_stride = 0; kfilm->use_light_pass = use_light_visibility || use_sample_clamp; |