[Bf-blender-cvs] [f523fb4] master: Cycles: Fix for fix (tm)

Sergey Sharybin noreply at git.blender.org
Tue Oct 25 18:29:21 CEST 2016


Commit: f523fb43f9b5c8a4a694e0bbd071935a4ed979b5
Author: Sergey Sharybin
Date:   Tue Oct 25 18:28:02 2016 +0200
Branches: master
https://developer.blender.org/rBf523fb43f9b5c8a4a694e0bbd071935a4ed979b5

Cycles: Fix for fix (tm)

Sorry guys, for some reason read the expression back-to-front
and did wrong fix :S

===================================================================

M	intern/cycles/kernel/geom/geom_object.h

===================================================================

diff --git a/intern/cycles/kernel/geom/geom_object.h b/intern/cycles/kernel/geom/geom_object.h
index 89087ea..cb2de3a 100644
--- a/intern/cycles/kernel/geom/geom_object.h
+++ b/intern/cycles/kernel/geom/geom_object.h
@@ -381,7 +381,7 @@ ccl_device_inline float3 bvh_clamp_direction(float3 dir)
 	const ssef mask = _mm_cmpgt_ps(fabs(dir), oopes);
 	const ssef signdir = signmsk(dir.m128) | oopes;
 #  ifndef __KERNEL_AVX__
-	ssef res = mask & signdir;
+	ssef res = mask & ssef(dir);
 	res = _mm_or_ps(res,_mm_andnot_ps(mask, signdir));
 #  else
 	ssef res = _mm_blendv_ps(signdir, dir, mask);




More information about the Bf-blender-cvs mailing list