diff options
Diffstat (limited to 'source/blender')
| -rw-r--r-- | source/blender/blenkernel/intern/sca.c | 4 | ||||
| -rw-r--r-- | source/blender/blenloader/intern/writefile.c | 3 | ||||
| -rw-r--r-- | source/blender/editors/space_logic/logic_window.c | 2 | ||||
| -rw-r--r-- | source/blender/makesdna/DNA_actuator_types.h | 13 |
4 files changed, 1 insertions, 21 deletions
diff --git a/source/blender/blenkernel/intern/sca.c b/source/blender/blenkernel/intern/sca.c index 88a28228639..e90a39e8c0e 100644 --- a/source/blender/blenkernel/intern/sca.c +++ b/source/blender/blenkernel/intern/sca.c @@ -435,9 +435,6 @@ void init_actuator(bActuator *act) oa= act->data; oa->flag= 15; break; - case ACT_IPO: - act->data= MEM_callocN(sizeof(bIpoActuator), "ipoact"); - break; case ACT_PROPERTY: act->data= MEM_callocN(sizeof(bPropertyActuator), "propact"); break; @@ -1059,7 +1056,6 @@ void BKE_sca_actuators_id_loop(ListBase *actlist, SCAActuatorIDFunc func, void * break; } /* Note: some types seems to be non-implemented? ACT_LAMP, ACT_MATERIAL... */ - case ACT_IPO: /* DEPRECATED */ case ACT_LAMP: case ACT_MATERIAL: case ACT_END_OBJECT: /* DEPRECATED */ diff --git a/source/blender/blenloader/intern/writefile.c b/source/blender/blenloader/intern/writefile.c index bc94ef9cc19..f1f90c4f9a0 100644 --- a/source/blender/blenloader/intern/writefile.c +++ b/source/blender/blenloader/intern/writefile.c @@ -1356,9 +1356,6 @@ static void write_actuators(WriteData *wd, ListBase *lb) case ACT_OBJECT: writestruct(wd, DATA, "bObjectActuator", 1, act->data); break; - case ACT_IPO: - writestruct(wd, DATA, "bIpoActuator", 1, act->data); - break; case ACT_PROPERTY: writestruct(wd, DATA, "bPropertyActuator", 1, act->data); break; diff --git a/source/blender/editors/space_logic/logic_window.c b/source/blender/editors/space_logic/logic_window.c index a8536496059..8802ab52725 100644 --- a/source/blender/editors/space_logic/logic_window.c +++ b/source/blender/editors/space_logic/logic_window.c @@ -397,8 +397,6 @@ static const char *actuator_name(int type) return N_("Action"); case ACT_OBJECT: return N_("Motion"); - case ACT_IPO: - return N_("F-Curve"); case ACT_LAMP: return N_("Lamp"); case ACT_CAMERA: diff --git a/source/blender/makesdna/DNA_actuator_types.h b/source/blender/makesdna/DNA_actuator_types.h index 59a058925a6..6bdea21da1e 100644 --- a/source/blender/makesdna/DNA_actuator_types.h +++ b/source/blender/makesdna/DNA_actuator_types.h @@ -362,12 +362,7 @@ typedef struct bActuator { #define ACT_ACTION_ADD 1 /* ipoactuator->type */ -#define ACT_IPO_PLAY 0 -#define ACT_IPO_PINGPONG 1 -#define ACT_IPO_FLIPPER 2 -#define ACT_IPO_LOOP_STOP 3 -#define ACT_IPO_LOOP_END 4 -#define ACT_IPO_KEY2KEY 5 +/* used for conversion from 2.01 */ #define ACT_IPO_FROM_PROP 6 /* groupactuator->type */ @@ -386,12 +381,6 @@ typedef struct bActuator { #define ACT_IPOCHILD (1 << 4) #define ACT_IPOADD (1 << 5) -/* ipoactuator->flag for k2k */ -#define ACT_K2K_PREV 1 -#define ACT_K2K_CYCLIC 2 -#define ACT_K2K_PINGPONG 4 -#define ACT_K2K_HOLD 8 - /* property actuator->type */ #define ACT_PROP_ASSIGN 0 #define ACT_PROP_ADD 1 |