griefith/test2
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Removed unused 'action specific' marker stuff I committed earlier. In

Browse Source 
the meantime, only the 'scene' marker set will be supported.
This commit is contained in:
Joshua Leung
2006-11-28 04:58:57 +00:00
parent 008d789f15
commit 35c83ca356
3 changed files with 1 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
source/blender/blenkernel/intern/action.c
View File

@@ -176,10 +176,6 @@ void free_action(bAction *act)
free_constraint_channels(&chan->constraintChannels);
}
/* Free markers */
if (act->markers.first)
BLI_freelistN (&act->markers);
if (act->chanbase.first)
BLI_freelistN (&act->chanbase);
}
@@ -193,7 +189,6 @@ bAction* copy_action(bAction *src)
dst= copy_libblock(src);
duplicatelist(&(dst->chanbase), &(src->chanbase));
duplicatelist(&(dst->markers), &(src->markers));
for (dchan=dst->chanbase.first, schan=src->chanbase.first; dchan; dchan=dchan->next, schan=schan->next){
dchan->ipo = copy_ipo(dchan->ipo);

5
source/blender/blenloader/intern/writefile.c
View File

@@ -1681,7 +1681,6 @@ static void write_actions(WriteData *wd, ListBase *idbase)
{
bAction *act;
bActionChannel *chan;
TimeMarker *marker;
for(act=idbase->first; act; act= act->id.next) {
if (act->id.us>0 || wd->current) {
@@ -1692,10 +1691,6 @@ static void write_actions(WriteData *wd, ListBase *idbase)
writestruct(wd, DATA, "bActionChannel", 1, chan);
write_constraint_channels(wd, &chan->constraintChannels);
}
/* writing dynamic list of TimeMarkers to the blend file */
for(marker= act->markers.first; marker; marker= marker->next)
writestruct(wd, DATA, "TimeMarker", 1, marker);
}
}
}

8
source/blender/makesdna/DNA_action_types.h
View File

@@ -101,7 +101,6 @@ typedef struct bActionChannel {
typedef struct bAction {
ID id;
ListBase chanbase; /* Action Channels in this action */
ListBase markers; /* Markers specific to this action */
} bAction;
typedef struct SpaceAction {
@@ -115,7 +114,7 @@ typedef struct SpaceAction {
View2D v2d;
bAction *action;
int flag;
short pin, actnr, lock, markert;
short pin, actnr, lock, pad;
float timeslide;
} SpaceAction;
@@ -129,11 +128,6 @@ typedef struct SpaceAction {
#define SACTION_MOVING 1 /* during transform */
#define SACTION_SLIDERS 2 /* show sliders (if relevant) - limited to shape keys for now */
/* SpaceAction Marker Type */
#define SACTION_NOMARKERS 0 /* no markers */
#define SACTION_SCMARKERS 1 /* markers for current scene */
#define SACTION_ACMARKERS 2 /* markers from current action */
/* Pose->flag */
#define POSE_RECALC 1
#define POSE_LOCKED 2