diff options
| author | João Araújo <jaraujo98@gmail.com> | 2017-07-26 13:25:24 +0300 |
|---|---|---|
| committer | João Araújo <jaraujo98@gmail.com> | 2017-07-26 13:25:24 +0300 |
| commit | 59908f5eb73670c97c5bb817290a0dac99089900 (patch) | |
| tree | 709de097c1fac2ff7b172a8b50dc8a91d7b74860 /intern/cycles/kernel/geom/geom_curve.h | |
| parent | 595f2ca2e06e07acaccc473982bde7a5ed644b50 (diff) | |
| parent | edc6bec9d60204cb81d2e7533402630b076d0d32 (diff) | |
Merge remote-tracking branch 'origin/master' into gsoc2016-improved_extrusiongsoc2016-improved_extrusion
Diffstat (limited to 'intern/cycles/kernel/geom/geom_curve.h')
| -rw-r--r-- | intern/cycles/kernel/geom/geom_curve.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/intern/cycles/kernel/geom/geom_curve.h b/intern/cycles/kernel/geom/geom_curve.h index 8888000f0e6..5c3b0ee3c15 100644 --- a/intern/cycles/kernel/geom/geom_curve.h +++ b/intern/cycles/kernel/geom/geom_curve.h @@ -565,7 +565,7 @@ ccl_device_curveintersect bool bvh_cardinal_curve_intersect(KernelGlobals *kg, I r_ext = mw_extension + r_curr; #ifdef __KERNEL_SSE__ const float3 p_curr_sq = p_curr * p_curr; - const float3 dxxx = _mm_sqrt_ss(_mm_hadd_ps(p_curr_sq.m128, p_curr_sq.m128)); + const float3 dxxx(_mm_sqrt_ss(_mm_hadd_ps(p_curr_sq.m128, p_curr_sq.m128))); float d = dxxx.x; #else float d = sqrtf(p_curr.x * p_curr.x + p_curr.y * p_curr.y); |