diff options
| author | Joshua Leung <aligorith@gmail.com> | 2007-10-30 08:22:46 +0300 |
|---|---|---|
| committer | Joshua Leung <aligorith@gmail.com> | 2007-10-30 08:22:46 +0300 |
| commit | 20905354fcaeabfc5138c3a8d61ed82e2f3ae052 (patch) | |
| tree | 7ab42c2adbbaf955cc4b22291007866f053cd44d /source | |
| parent | ef9ead78f2516269389149fcaba13b998ff85e8e (diff) | |
Bugfix: "exploding candy"
Missed a case where I converted set_constraint_target incorrectly. This resulted in mancandy "exploding" on loading proxy-linked mancandy files.
Diffstat (limited to 'source')
| -rw-r--r-- | source/blender/blenkernel/intern/armature.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/source/blender/blenkernel/intern/armature.c b/source/blender/blenkernel/intern/armature.c index 38a6a05017c..a282fd24509 100644 --- a/source/blender/blenkernel/intern/armature.c +++ b/source/blender/blenkernel/intern/armature.c @@ -1264,8 +1264,8 @@ static void pose_proxy_synchronize(Object *ob, Object *from, int layer_protected /* constraints, set target ob pointer to own object */ copy_constraints(&pchanw.constraints, &pchanp->constraints); - - for(con= pchanw.constraints.first; con; con= con->next) { + + for (con= pchanw.constraints.first; con; con= con->next) { bConstraintTypeInfo *cti= constraint_get_typeinfo(con); ListBase targets = {NULL, NULL}; bConstraintTarget *ct; @@ -1274,10 +1274,8 @@ static void pose_proxy_synchronize(Object *ob, Object *from, int layer_protected cti->get_constraint_targets(con, &targets); for (ct= targets.first; ct; ct= ct->next) { - if (ct->tar == from) { + if (ct->tar == from) ct->tar = ob; - strcpy(ct->subtarget, ""); - } } if (cti->flush_constraint_targets) @@ -1286,7 +1284,7 @@ static void pose_proxy_synchronize(Object *ob, Object *from, int layer_protected } /* free stuff from current channel */ - if(pchan->path) MEM_freeN(pchan->path); + if (pchan->path) MEM_freeN(pchan->path); free_constraints(&pchan->constraints); /* the final copy */ |