Commit: 5aa6a2ec06bbfa9ddd255c90ee02da5f9be36f30
Author: Lukas Stockner
Date: Sat Oct 29 20:06:52 2016 +0200
Branches: master
https://developer.blender.org/rB5aa6a2ec06bbfa9ddd255c90ee02da5f9be36f30
Fix T49846: OpenCL rendering compilation failure
===================================================================
M intern/cycles/kernel/kernel_projection.h
M intern/cycles/kernel/kernel_shader.h
===================================================================
diff --git a/intern/cycles/kernel/kernel_projection.h
b/intern/cycles/kernel/kernel_projection.h
index ba714b6..9a2b088 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 6480975..a8070a1 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);
_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
