Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2012-01-22 04:53:53 +0400
committerCampbell Barton <ideasman42@gmail.com>2012-01-22 04:53:53 +0400
commitf45a8105eedc93ba8c4284f85e7e29f3eaeeb510 (patch)
treeef8487a8cc41313fb059f26a7ea190ea220a8472 /source/blender/editors/object
parent2139c7080eb6bc05111b09f93ad1836930434dad (diff)
fix for 'next' being set twice in the for loop from r43588
Diffstat (limited to 'source/blender/editors/object')
-rw-r--r--source/blender/editors/object/object_add.c12
1 files changed, 7 insertions, 5 deletions
diff --git a/source/blender/editors/object/object_add.c b/source/blender/editors/object/object_add.c
index 6ac2ee820db..dce2179db24 100644
--- a/source/blender/editors/object/object_add.c
+++ b/source/blender/editors/object/object_add.c
@@ -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;
}
}