diff options
| author | Lukas Stockner <lukas.stockner@freenet.de> | 2016-10-29 21:06:52 +0300 |
|---|---|---|
| committer | Lukas Stockner <lukas.stockner@freenet.de> | 2016-10-29 21:06:52 +0300 |
| commit | 5aa6a2ec06bbfa9ddd255c90ee02da5f9be36f30 (patch) | |
| tree | a35ea8aec0b558a4eb9068f6f806c0a8ba41fe91 /intern | |
| parent | 1272ee455e7aeed3f6acb0b8a8366af5ad6aec99 (diff) | |
Fix T49846: OpenCL rendering compilation failure
Diffstat (limited to 'intern')
| -rw-r--r-- | intern/cycles/kernel/kernel_projection.h | 2 | ||||
| -rw-r--r-- | intern/cycles/kernel/kernel_shader.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/intern/cycles/kernel/kernel_projection.h b/intern/cycles/kernel/kernel_projection.h index ba714b6c382..9a2b0884a7e 100644 --- a/intern/cycles/kernel/kernel_projection.h +++ b/intern/cycles/kernel/kernel_projection.h @@ -235,7 +235,7 @@ ccl_device_inline void spherical_stereo_transform(KernelGlobals *kg, float3 *P, if(kernel_data.cam.pole_merge_angle_to > 0.0f) { const float pole_merge_angle_from = kernel_data.cam.pole_merge_angle_from, pole_merge_angle_to = kernel_data.cam.pole_merge_angle_to; - float altitude = fabsf(safe_asinf(D->z)); + float altitude = fabsf(safe_asinf((*D).z)); if(altitude > pole_merge_angle_to) { interocular_offset = 0.0f; } diff --git a/intern/cycles/kernel/kernel_shader.h b/intern/cycles/kernel/kernel_shader.h index 6480975a84d..a8070a133de 100644 --- a/intern/cycles/kernel/kernel_shader.h +++ b/intern/cycles/kernel/kernel_shader.h @@ -276,7 +276,7 @@ ccl_device_inline void shader_setup_from_sample(KernelGlobals *kg, #ifdef __OBJECT_MOTION__ shader_setup_object_transforms(kg, sd, time); -#else +#endif } else if(lamp != LAMP_NONE) { ccl_fetch(sd, ob_tfm) = lamp_fetch_transform(kg, lamp, false); |