[Bf-blender-cvs] [93ea10d] master: Fix for rigidbody treating the quat as a v3 with pointcache

Campbell Barton noreply at git.blender.org
Fri Apr 11 10:20:58 CEST 2014


Commit: 93ea10d8fb6570912c5abaa2ea7134e625c3afef
Author: Campbell Barton
Date:   Fri Apr 11 18:16:48 2014 +1000
https://developer.blender.org/rB93ea10d8fb6570912c5abaa2ea7134e625c3afef

Fix for rigidbody treating the quat as a v3 with pointcache

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

M	source/blender/blenkernel/intern/pointcache.c

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

diff --git a/source/blender/blenkernel/intern/pointcache.c b/source/blender/blenkernel/intern/pointcache.c
index 7458b4a..57abd49 100644
--- a/source/blender/blenkernel/intern/pointcache.c
+++ b/source/blender/blenkernel/intern/pointcache.c
@@ -1059,7 +1059,7 @@ static void ptcache_rigidbody_interpolate(int index, void *rb_v, void **data, fl
 		if (rbo->type == RBO_TYPE_ACTIVE) {
 			
 			copy_v3_v3(keys[1].co, rbo->pos);
-			copy_v3_v3(keys[1].rot, rbo->orn);
+			copy_qt_qt(keys[1].rot, rbo->orn);
 			
 			if (old_data) {
 				memcpy(keys[2].co, data, 3 * sizeof(float));
@@ -1075,7 +1075,7 @@ static void ptcache_rigidbody_interpolate(int index, void *rb_v, void **data, fl
 			interp_qt_qtqt(keys->rot, keys[1].rot, keys[2].rot, (cfra - cfra1) / dfra);
 			
 			copy_v3_v3(rbo->pos, keys->co);
-			copy_v3_v3(rbo->orn, keys->rot);
+			copy_qt_qt(rbo->orn, keys->rot);
 		}
 	}
 }




More information about the Bf-blender-cvs mailing list