diff options
| author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2011-12-31 19:18:13 +0400 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2011-12-31 19:18:13 +0400 |
| commit | b5595298d36a5023cc33ed41463fd6c032f2ec7b (patch) | |
| tree | e3a404393ff4a8e39a991f9a3d8ca78c0d3033a7 /intern/cycles/device/device_multi.cpp | |
| parent | 1b4487e813edac9c5b57b6d5c6175c46c4a54b1c (diff) | |
Cycles code refactoring: change displace kernel into more generic shader
evaluate kernel, added background shader evaluate.
Diffstat (limited to 'intern/cycles/device/device_multi.cpp')
| -rw-r--r-- | intern/cycles/device/device_multi.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/intern/cycles/device/device_multi.cpp b/intern/cycles/device/device_multi.cpp index fc5348ad168..7f24e5789cc 100644 --- a/intern/cycles/device/device_multi.cpp +++ b/intern/cycles/device/device_multi.cpp @@ -306,8 +306,8 @@ public: if(task.buffer) subtask.buffer = sub.ptr_map[task.buffer]; if(task.rng_state) subtask.rng_state = sub.ptr_map[task.rng_state]; if(task.rgba) subtask.rgba = sub.ptr_map[task.rgba]; - if(task.displace_input) subtask.displace_input = sub.ptr_map[task.displace_input]; - if(task.displace_offset) subtask.displace_offset = sub.ptr_map[task.displace_offset]; + if(task.shader_input) subtask.shader_input = sub.ptr_map[task.shader_input]; + if(task.shader_output) subtask.shader_output = sub.ptr_map[task.shader_output]; sub.device->task_add(subtask); } |