Revision: 43590
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=43590
Author: campbellbarton
Date: 2012-01-22 00:53:53 +0000 (Sun, 22 Jan 2012)
Log Message:
-----------
fix for 'next' being set twice in the for loop from r43588
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=43588
Modified Paths:
--------------
trunk/blender/source/blender/editors/object/object_add.c
Modified: trunk/blender/source/blender/editors/object/object_add.c
===================================================================
--- trunk/blender/source/blender/editors/object/object_add.c 2012-01-22
00:49:12 UTC (rev 43589)
+++ trunk/blender/source/blender/editors/object/object_add.c 2012-01-22
00:53:53 UTC (rev 43590)
@@ -1790,21 +1790,23 @@
/* 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;
}
}
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
