diff options
| author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2011-09-01 23:43:57 +0400 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2011-09-01 23:43:57 +0400 |
| commit | 8ddef5163fc7bad1c55b6b8c1d9f6f349719800b (patch) | |
| tree | f16509d61445a2b8cb7d551f50d46432dc7717ba /intern/cycles/kernel/kernel_shader.h | |
| parent | 27102bfec4845df5ba8e65f7ca64d04840fbeab3 (diff) | |
Cycles: fix broken kernel compile after recent change, some tweaks
to UI to only show options when available, fix linux lib detection.
Diffstat (limited to 'intern/cycles/kernel/kernel_shader.h')
| -rw-r--r-- | intern/cycles/kernel/kernel_shader.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/intern/cycles/kernel/kernel_shader.h b/intern/cycles/kernel/kernel_shader.h index ed3aec21207..237033eff8b 100644 --- a/intern/cycles/kernel/kernel_shader.h +++ b/intern/cycles/kernel/kernel_shader.h @@ -357,8 +357,8 @@ __device float3 shader_holdout_eval(KernelGlobals *kg, ShaderData *sd) if(sd->svm_closure == CLOSURE_HOLDOUT_ID) return make_float3(1.0f, 1.0f, 1.0f); else - return make_float3(0.0f, 0.0f, 0.0f); #endif + return make_float3(0.0f, 0.0f, 0.0f); } } |