diff options
| author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2019-03-18 21:06:21 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2019-03-18 21:06:21 +0300 |
| commit | a29186efb414cec130dbfe4f81173b64d37ad10a (patch) | |
| tree | cb7b98c42f938050a87ddb141f8f3e1197a25f9c /intern/cycles/render/light.h | |
| parent | b29790a953ff0f31c431daaaa2864e48bd38e94c (diff) | |
| parent | 01df4818a6e1d3b93517e48a617310481abd9339 (diff) | |
Merge branch 'blender2.7'
Diffstat (limited to 'intern/cycles/render/light.h')
| -rw-r--r-- | intern/cycles/render/light.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/intern/cycles/render/light.h b/intern/cycles/render/light.h index b7f3a047ad7..a627ec9bdc3 100644 --- a/intern/cycles/render/light.h +++ b/intern/cycles/render/light.h @@ -110,7 +110,7 @@ protected: * which doesn't contribute to the scene or which is only used for MIS * and scene doesn't need MIS. */ - void disable_ineffective_light(Device *device, Scene *scene); + void disable_ineffective_light(Scene *scene); void device_update_points(Device *device, DeviceScene *dscene, |