diff options
| author | Lukas Stockner <lukas.stockner@freenet.de> | 2018-06-14 23:54:42 +0300 |
|---|---|---|
| committer | Lukas Stockner <lukas.stockner@freenet.de> | 2018-06-14 23:54:42 +0300 |
| commit | 27de412ca8de4edad99a46ebdb8aadd7003e42a6 (patch) | |
| tree | 4e2659e3490519021195ba626de74adc4813e825 /intern/cycles/kernel/svm/svm.h | |
| parent | 525be2f579c994777328bd7ac206be4769d3e6a4 (diff) | |
| parent | 3ee606621cf53a2a4897e534e7e04d3632f419f8 (diff) | |
Merge remote-tracking branch 'origin/master' into blender2.8
Diffstat (limited to 'intern/cycles/kernel/svm/svm.h')
| -rw-r--r-- | intern/cycles/kernel/svm/svm.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/intern/cycles/kernel/svm/svm.h b/intern/cycles/kernel/svm/svm.h index bfa146f2d93..ce2affe96c8 100644 --- a/intern/cycles/kernel/svm/svm.h +++ b/intern/cycles/kernel/svm/svm.h @@ -243,7 +243,7 @@ ccl_device_noinline void svm_eval_nodes(KernelGlobals *kg, ShaderData *sd, ccl_a svm_node_geometry(kg, sd, stack, node.y, node.z); break; case NODE_CONVERT: - svm_node_convert(sd, stack, node.y, node.z, node.w); + svm_node_convert(kg, sd, stack, node.y, node.z, node.w); break; case NODE_TEX_COORD: svm_node_tex_coord(kg, sd, path_flag, stack, node, &offset); @@ -465,7 +465,7 @@ ccl_device_noinline void svm_eval_nodes(KernelGlobals *kg, ShaderData *sd, ccl_a svm_node_wireframe(kg, sd, stack, node); break; case NODE_WAVELENGTH: - svm_node_wavelength(sd, stack, node.y, node.z); + svm_node_wavelength(kg, sd, stack, node.y, node.z); break; case NODE_BLACKBODY: svm_node_blackbody(kg, sd, stack, node.y, node.z); |