kannonier8/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

Fix #32844: cycles camera motion blur producing completely blurred frames sometimes.

Browse Source
This commit is contained in:
Brecht Van Lommel 2012-10-15 17:56:40 +00:00
parent 45d6eb5dea
commit c10c6b1cea
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
intern/cycles/util/util_transform.h
View File

@ -304,10 +304,18 @@ __device_inline float4 quat_interpolate(float4 q1, float4 q2, float t)
{ {
float costheta = dot(q1, q2); float costheta = dot(q1, q2);
/* rotate around shortest angle */
if(costheta < 0.0f) {
costheta = -costheta;
q1 = -q1;
}
if(costheta > 0.9995f) { if(costheta > 0.9995f) {
/* linear interpolation in degenerate case */
return normalize((1.0f - t)*q1 + t*q2); return normalize((1.0f - t)*q1 + t*q2);
} }
else { else {
/* slerp */
float theta = acosf(clamp(costheta, -1.0f, 1.0f)); float theta = acosf(clamp(costheta, -1.0f, 1.0f));
float thetap = theta * t; float thetap = theta * t;
float4 qperp = normalize(q2 - q1 * costheta); float4 qperp = normalize(q2 - q1 * costheta);