diff options
| author | Joshua Leung <aligorith@gmail.com> | 2015-02-14 07:42:57 +0300 |
|---|---|---|
| committer | Joshua Leung <aligorith@gmail.com> | 2015-02-14 14:06:19 +0300 |
| commit | dd6edac8037a6b999cf1f41fdcdc93f2531a7155 (patch) | |
| tree | ff1a446a7b034f67ae5de16bd07eb284519f6a40 /source/blender/blenkernel/intern/sca.c | |
| parent | ec2ede430231ef7f32e76f0626f76a9733ee1b72 (diff) | |
Bring copy/free operations into line with changes in previous commit
Diffstat (limited to 'source/blender/blenkernel/intern/sca.c')
| -rw-r--r-- | source/blender/blenkernel/intern/sca.c | 37 |
1 files changed, 27 insertions, 10 deletions
diff --git a/source/blender/blenkernel/intern/sca.c b/source/blender/blenkernel/intern/sca.c index 4be75344133..9159c9e9afc 100644 --- a/source/blender/blenkernel/intern/sca.c +++ b/source/blender/blenkernel/intern/sca.c @@ -323,15 +323,23 @@ void unlink_actuators(ListBase *lb) void free_actuator(bActuator *act) { - bSoundActuator *sa; - if (act->data) { switch (act->type) { - case ACT_SOUND: - sa = (bSoundActuator *) act->data; - if (sa->sound) - id_us_min((ID *) sa->sound); - break; + case ACT_ACTION: + case ACT_SHAPEACTION: + { + bActionActuator *aa = (bActionActuator *)act->data; + if (aa->act) + id_us_min((ID *)aa->act); + break; + } + case ACT_SOUND: + { + bSoundActuator *sa = (bSoundActuator *) act->data; + if (sa->sound) + id_us_min((ID *)sa->sound); + break; + } } MEM_freeN(act->data); @@ -351,7 +359,6 @@ void free_actuators(ListBase *lb) bActuator *copy_actuator(bActuator *act) { bActuator *actn; - bSoundActuator *sa; act->mynew=actn= MEM_dupallocN(act); actn->flag |= ACT_NEW; @@ -360,11 +367,21 @@ bActuator *copy_actuator(bActuator *act) } switch (act->type) { + case ACT_ACTION: + case ACT_SHAPEACTION: + { + bActionActuator *aa = (bActionActuator *)act->data; + if (aa->act) + id_us_plus((ID *)aa->act); + break; + } case ACT_SOUND: - sa= (bSoundActuator *)act->data; + { + bSoundActuator *sa = (bSoundActuator *)act->data; if (sa->sound) - id_us_plus((ID *) sa->sound); + id_us_plus((ID *)sa->sound); break; + } } return actn; } |