diff options
| author | Lukas Tönne <lukas.toenne@gmail.com> | 2016-04-20 17:45:29 +0300 |
|---|---|---|
| committer | Lukas Tönne <lukas.toenne@gmail.com> | 2016-04-20 17:45:29 +0300 |
| commit | aae0598aa233d43d0ffc81a070b2ce20d6871c1d (patch) | |
| tree | 378100f45cf1db972c671a6886496a5604f7ab29 /intern/cycles/device/device_network.h | |
| parent | 95d7d3c2a6aa91f1dcb33ff0cdfc751e2886d8cd (diff) | |
| parent | d7e4f920fd93a4ae5679e0eb6b228a349ab3b082 (diff) | |
Merge branch 'master' into temp_depsgraph_split_ubereval
Diffstat (limited to 'intern/cycles/device/device_network.h')
| -rw-r--r-- | intern/cycles/device/device_network.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/intern/cycles/device/device_network.h b/intern/cycles/device/device_network.h index 2e751f6697f..60ecc1d0a86 100644 --- a/intern/cycles/device/device_network.h +++ b/intern/cycles/device/device_network.h @@ -132,7 +132,7 @@ public: archive & type & task.x & task.y & task.w & task.h; archive & task.rgba_byte & task.rgba_half & task.buffer & task.sample & task.num_samples; archive & task.offset & task.stride; - archive & task.shader_input & task.shader_output & task.shader_eval_type; + archive & task.shader_input & task.shader_output & task.shader_output_luma & task.shader_eval_type; archive & task.shader_x & task.shader_w; archive & task.need_finish_queue; } @@ -291,7 +291,7 @@ public: *archive & type & task.x & task.y & task.w & task.h; *archive & task.rgba_byte & task.rgba_half & task.buffer & task.sample & task.num_samples; *archive & task.offset & task.stride; - *archive & task.shader_input & task.shader_output & task.shader_eval_type; + *archive & task.shader_input & task.shader_output & task.shader_output_luma & task.shader_eval_type; *archive & task.shader_x & task.shader_w; *archive & task.need_finish_queue; |