[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [46780] trunk/blender/source/blender/ ikplugin/intern/itasc_plugin.cpp: Fix #31430: itasc solver assertion failure with debug builds.

[Brecht Van Lommel]

Revision: 46780
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=46780
Author:   blendix
Date:     2012-05-18 15:06:23 +0000 (Fri, 18 May 2012)
Log Message:
-----------
Fix #31430: itasc solver assertion failure with debug builds.

Modified Paths:
--------------
    trunk/blender/source/blender/ikplugin/intern/itasc_plugin.cpp

Modified: trunk/blender/source/blender/ikplugin/intern/itasc_plugin.cpp
===================================================================
--- trunk/blender/source/blender/ikplugin/intern/itasc_plugin.cpp	2012-05-18 14:49:30 UTC (rev 46779)
+++ trunk/blender/source/blender/ikplugin/intern/itasc_plugin.cpp	2012-05-18 15:06:23 UTC (rev 46780)
@@ -996,7 +996,7 @@
 
 	// assume uniform scaling and take Y scale as general scale for the armature
 	scale = len_v3(ikscene->blArmature->obmat[1]);
-	rot = &ikscene->jointArray(0);
+	rot = (ikscene->jointArray.rows() > 0) ? &ikscene->jointArray(0) : NULL;
 	for (joint=a=0, ikchan = ikscene->channels; a<ikscene->numchan && joint<ikscene->numjoint; ++a, ++ikchan) {
 		pchan= ikchan->pchan;
 		bone= pchan->bone;
@@ -1037,7 +1037,7 @@
 	// rest pose is 0 
 	SetToZero(ikscene->jointArray);
 	// except for transY joints
-	rot = &ikscene->jointArray(0);
+	rot = (ikscene->jointArray.rows() > 0) ? &ikscene->jointArray(0) : NULL;
 	for (joint=a=0, ikchan = ikscene->channels; a<ikscene->numchan && joint<ikscene->numjoint; ++a, ++ikchan) {
 		pchan= ikchan->pchan;
 		bone= pchan->bone;
@@ -1135,7 +1135,7 @@
 		// in Blender, the rest pose is always 0 for joints
 		BKE_pose_rest(ikscene);
 	}
-	rot = &ikscene->jointArray(0);
+	rot = (ikscene->jointArray.rows() > 0) ? &ikscene->jointArray(0) : NULL;
 	for (a=0, ikchan = ikscene->channels; a<tree->totchannel; ++a, ++ikchan) {
 		pchan= ikchan->pchan;
 		bone= pchan->bone;