griefith/test2
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

fix for 'next' being set twice in the for loop from r43588

Browse Source
This commit is contained in:
Campbell Barton
2012-01-22 00:53:53 +00:00
parent 2139c7080e
commit f45a8105ee
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
source/blender/editors/object/object_add.c
View File

@@ -1790,21 +1790,23 @@ static Base *object_add_duplicate_internal(Main *bmain, Scene *scene, Base *base
/* check if obdata is copied */
if(didit) {
Key *key = ob_get_key(obn);
bActuator *act;
if(dupflag & USER_DUP_ACT) {
bActuator *act;
BKE_copy_animdata_id_action((ID *)obn->data);
if(key) BKE_copy_animdata_id_action((ID*)key);
if(key) {
BKE_copy_animdata_id_action((ID*)key);
}
/* Update the duplicated action in the action actuators */
for (act= obn->actuators.first; act; act= act->next) {
for (act = obn->actuators.first; act; act = act->next) {
if(act->type == ACT_ACTION) {
bActionActuator* actact = (bActionActuator*) act->data;
if(actact->act == ob->adt->action) {
actact->act = obn->adt->action;
}
}
act= act->next;
}
}