archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Bugfix #19616: vertex group select as IK target cause crash in Blender2.5

Browse Source 
Thanks to Masahito Takahashi (mato)  for the report and patch to fix this!
This commit is contained in:
Joshua Leung
2009-10-12 09:39:57 +00:00
parent eaadc0685b
commit 829bbda7f5
5 changed files with 16 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
source/blender/ikplugin/intern/itasc_plugin.cpp
View File

@@ -89,6 +89,7 @@ void KDL::SetToZero(JntArray& array);
// one structure for each target in the scene
struct IK_Target
{
struct Scene *blscene;
iTaSC::MovingFrame* target;
iTaSC::ConstraintSet* constraint;
struct bConstraint* blenderConstraint;
@@ -105,6 +106,7 @@ struct IK_Target
float eeRest[4][4]; //end effector initial pose relative to armature
IK_Target() {
blscene = NULL;
target = NULL;
constraint = NULL;
blenderConstraint = NULL;
@@ -155,6 +157,7 @@ struct IK_Channel {
struct IK_Scene
{
struct Scene *blscene;
IK_Scene* next;
int numchan; // number of channel in pchan
int numjoint; // number of joint in jointArray
@@ -172,6 +175,7 @@ struct IK_Scene
std::vector<IK_Target*> targets;
IK_Scene() {
blscene = NULL;
next = NULL;
channels = NULL;
armature = NULL;
@@ -533,7 +537,7 @@ static bool target_callback(const iTaSC::Timestamp& timestamp, const iTaSC::Fram
bConstraint* constraint = (bConstraint*)target->blenderConstraint;
float tarmat[4][4];
get_constraint_target_matrix(constraint, 0, CONSTRAINT_OBTYPE_OBJECT, target->owner, tarmat, 1.0);
get_constraint_target_matrix(target->blscene, constraint, 0, CONSTRAINT_OBTYPE_OBJECT, target->owner, tarmat, 1.0);
// rootmat contains the target pose in world coordinate
// if enforce is != 1.0, blend the target position with the end effector position
@@ -601,7 +605,7 @@ static bool base_callback(const iTaSC::Timestamp& timestamp, const iTaSC::Frame&
IK_Channel &rootchan = ikscene->channels[0];
// get polar target matrix in world space
get_constraint_target_matrix(ikscene->polarConstraint, 1, CONSTRAINT_OBTYPE_OBJECT, ikscene->blArmature, mat, 1.0);
get_constraint_target_matrix(ikscene->blscene, ikscene->polarConstraint, 1, CONSTRAINT_OBTYPE_OBJECT, ikscene->blArmature, mat, 1.0);
// convert to armature space
Mat4MulMat4(polemat, mat, imat);
// get the target in world space (was computed before as target object are defined before base object)
@@ -1050,6 +1054,7 @@ static IK_Scene* convert_tree(Scene *blscene, Object *ob, bPoseChannel *pchan)
return NULL;
ikscene = new IK_Scene;
ikscene->blscene = blscene;
arm = new iTaSC::Armature();
scene = new iTaSC::Scene();
ikscene->channels = new IK_Channel[tree->totchannel];
@@ -1382,6 +1387,7 @@ static IK_Scene* convert_tree(Scene *blscene, Object *ob, bPoseChannel *pchan)
// finally add the constraint
for (t=0; t<ikscene->targets.size(); t++) {
IK_Target* iktarget = ikscene->targets[t];
iktarget->blscene = blscene;
condata= (bKinematicConstraint*)iktarget->blenderConstraint->data;
pchan = tree->pchan[iktarget->channel];
unsigned int controltype, bonecnt;