[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [19984] trunk/blender/source/blender/src/ editarmature.c: Possible fix for bug #18648: one armature disappears when joining

[Brecht Van Lommel]

Revision: 19984
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=19984
Author:   blendix
Date:     2009-04-29 21:33:05 +0200 (Wed, 29 Apr 2009)

Log Message:
-----------
Possible fix for bug #18648: one armature disappears when joining
armatures. Not sure it actually fixes the problem because I can't
test this on Win 64, but this fixes use of unitialized memory at
least. Mat4MulMat34 only sets the 3x3 part of the 4x4 matrix, which
may lead to a NaN bone roll value.

Modified Paths:
--------------
    trunk/blender/source/blender/src/editarmature.c

Modified: trunk/blender/source/blender/src/editarmature.c
===================================================================
--- trunk/blender/source/blender/src/editarmature.c	2009-04-29 19:13:32 UTC (rev 19983)
+++ trunk/blender/source/blender/src/editarmature.c	2009-04-29 19:33:05 UTC (rev 19984)
@@ -715,6 +715,7 @@
 						VecSubf(delta, curbone->tail, curbone->head);
 						vec_roll_to_mat3(delta, curbone->roll, temp);
 						
+						Mat4One(premat); /* Mat4MulMat34 only sets 3x3 part */
 						Mat4MulMat34(premat, temp, mat);
 						
 						Mat4MulVecfl(mat, curbone->head);