forked from bartvdbraak/blender
BGE Animations: FCurve Actuators are now converted to Action Actuators in do_versions(). Note: The fcurve actuator still needs to be removed from menus and such.
This commit is contained in:
parent
c02006bc2b
commit
47b061609d
@ -11662,8 +11662,42 @@ static void do_versions(FileData *fd, Library *lib, Main *main)
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
|
||||||
|
{
|
||||||
|
/* convert fcurve actuator to action actuator */
|
||||||
|
Object *ob;
|
||||||
|
bActuator *act;
|
||||||
|
bIpoActuator *ia;
|
||||||
|
bActionActuator *aa;
|
||||||
|
|
||||||
|
for (ob= main->object.first; ob; ob= ob->id.next) {
|
||||||
|
for (act= ob->actuators.first; act; act= act->next) {
|
||||||
|
if (act->type == ACT_IPO) {
|
||||||
|
// Create the new actuator
|
||||||
|
ia= act->data;
|
||||||
|
aa= MEM_callocN(sizeof(bActionActuator), "fcurve -> action actuator do_version");
|
||||||
|
|
||||||
|
// Copy values
|
||||||
|
aa->type = ia->type;
|
||||||
|
aa->flag = ia->flag;
|
||||||
|
aa->sta = ia->sta;
|
||||||
|
aa->end = ia->end;
|
||||||
|
strcpy(aa->name, ia->name);
|
||||||
|
strcpy(aa->frameProp, ia->frameProp);
|
||||||
|
aa->act = ob->adt->action;
|
||||||
|
|
||||||
|
// Get rid of the old actuator
|
||||||
|
MEM_freeN(ia);
|
||||||
|
|
||||||
|
// Assign the new actuator
|
||||||
|
act->data = aa;
|
||||||
|
act->type= act->otype= ACT_ACTION;
|
||||||
|
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
/* WATCH IT!!!: pointers from libdata have not been converted yet here! */
|
/* WATCH IT!!!: pointers from libdata have not been converted yet here! */
|
||||||
/* WATCH IT 2!: Userdef struct init has to be in editors/interface/resources.c! */
|
/* WATCH IT 2!: Userdef struct init has to be in editors/interface/resources.c! */
|
||||||
|
|
||||||
|
@ -122,6 +122,7 @@ typedef struct bObjectActuator {
|
|||||||
struct Object *reference;
|
struct Object *reference;
|
||||||
} bObjectActuator;
|
} bObjectActuator;
|
||||||
|
|
||||||
|
/* deprecated, handled by bActionActuator now */
|
||||||
typedef struct bIpoActuator {
|
typedef struct bIpoActuator {
|
||||||
short flag, type;
|
short flag, type;
|
||||||
float sta, end;
|
float sta, end;
|
||||||
|
Loading…
Reference in New Issue
Block a user