blender
/
blender
131
398
Fork 575
Code Issues 6.2k Pull Requests 748 Projects 19 Wiki Activity

Fix: Joining armatures wasn't updating Action Constraints properly 

The code here was still trying to access ancient 2.4x "action channels" to rename
them. Now, this renames the relevant FCurves instead.
This commit is contained in:
Joshua Leung 2015-01-22 02:29:18 +13:00
parent 9617446be2
commit 6248381783
1 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
source/blender/editors/armature/armature_relations.c
View File

@ -29,6 +29,7 @@
* \ingroup edarmature
*/
#include "DNA_anim_types.h"
#include "DNA_armature_types.h"
#include "DNA_constraint_types.h"
#include "DNA_object_types.h"
@ -99,18 +100,11 @@ static void joined_armature_fix_links_constraints(
/* action constraint? (pose constraints only) */
if (con->type == CONSTRAINT_TYPE_ACTION) {
bActionConstraint *data = con->data; // XXX old animation system
bAction *act;
bActionChannel *achan;
bActionConstraint *data = con->data;
if (data->act) {
act = data->act;
for (achan = act->chanbase.first; achan; achan = achan->next) {
if (STREQ(achan->name, pchan->name)) {
BLI_strncpy(achan->name, curbone->name, sizeof(achan->name));
}
}
BKE_action_fix_paths_rename(&tarArm->id, data->act, "pose.bones[",
pchan->name, curbone->name, 0, 0, false);
}
}