Removed unused 'action specific' marker stuff I committed earlier. In
authorJoshua Leung <aligorith@gmail.com>
Tue, 28 Nov 2006 04:58:57 +0000 (04:58 +0000)
committerJoshua Leung <aligorith@gmail.com>
Tue, 28 Nov 2006 04:58:57 +0000 (04:58 +0000)
the meantime, only the 'scene' marker set will be supported.

source/blender/blenkernel/intern/action.c
source/blender/blenloader/intern/writefile.c
source/blender/makesdna/DNA_action_types.h

index 3ee6b89804c097702e84760452dd7a3939143976..9f42e682e82bab77e34643715df6ea723bd15eea 100644 (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);
index 67795650d8d82063c55f049dbdf3feee4d264e8b..fa454289b5b08f97570c74d7d1eac9811a8b15bf 100644 (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);
                }
        }
 }
index d9db6e0c8894063023e678d06e50a55a76434098..a9c8bc03add7af9fb20e21425de01ae5655d8d98 100644 (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