Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fix T49846: OpenCL rendering compilation failure

Browse Source
This commit is contained in:
Lukas Stockner
2016-10-29 20:06:52 +02:00
parent 1272ee455e
commit 5aa6a2ec06
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
intern/cycles/kernel/kernel_projection.h
View File

@@ -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) { if(kernel_data.cam.pole_merge_angle_to > 0.0f) {
const float pole_merge_angle_from = kernel_data.cam.pole_merge_angle_from, const float pole_merge_angle_from = kernel_data.cam.pole_merge_angle_from,
pole_merge_angle_to = kernel_data.cam.pole_merge_angle_to; 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) { if(altitude > pole_merge_angle_to) {
interocular_offset = 0.0f; interocular_offset = 0.0f;
} }

2
intern/cycles/kernel/kernel_shader.h
View File

@@ -276,7 +276,7 @@ ccl_device_inline void shader_setup_from_sample(KernelGlobals *kg,
#ifdef __OBJECT_MOTION__ #ifdef __OBJECT_MOTION__
shader_setup_object_transforms(kg, sd, time); shader_setup_object_transforms(kg, sd, time);
#else #endif
} }
else if(lamp != LAMP_NONE) { else if(lamp != LAMP_NONE) {
ccl_fetch(sd, ob_tfm) = lamp_fetch_transform(kg, lamp, false); ccl_fetch(sd, ob_tfm) = lamp_fetch_transform(kg, lamp, false);