diff options
| author | Lukas Stockner <lukas.stockner@freenet.de> | 2017-11-05 23:59:17 +0300 |
|---|---|---|
| committer | Lukas Stockner <lukas.stockner@freenet.de> | 2017-11-14 06:17:54 +0300 |
| commit | 212a8d9e5ae78a30ed4c35161d91eeca35eaa41f (patch) | |
| tree | c66ac95d5787511a0c27580e6c03c231a1756b90 /intern/cycles/kernel/svm | |
| parent | d8066fb0f145395594d0a952a4c0f70206dc0214 (diff) | |
Cycles: Make per-object random value output also work for Lamps
Diffstat (limited to 'intern/cycles/kernel/svm')
| -rw-r--r-- | intern/cycles/kernel/svm/svm_geometry.h | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/intern/cycles/kernel/svm/svm_geometry.h b/intern/cycles/kernel/svm/svm_geometry.h index cce4e89e715..9af4a0182d9 100644 --- a/intern/cycles/kernel/svm/svm_geometry.h +++ b/intern/cycles/kernel/svm/svm_geometry.h @@ -90,7 +90,15 @@ ccl_device void svm_node_object_info(KernelGlobals *kg, ShaderData *sd, float *s } case NODE_INFO_OB_INDEX: data = object_pass_id(kg, sd->object); break; case NODE_INFO_MAT_INDEX: data = shader_pass_id(kg, sd); break; - case NODE_INFO_OB_RANDOM: data = object_random_number(kg, sd->object); break; + case NODE_INFO_OB_RANDOM: { + if(sd->lamp != LAMP_NONE) { + data = lamp_random_number(kg, sd->lamp); + } + else { + data = object_random_number(kg, sd->object); + } + break; + } default: data = 0.0f; break; } |