← Back to branch summary

~ubuntu-branches/ubuntu/trusty/blender/trusty

« back to all changes in this revision

Viewing changes to source/blender/blenkernel/nla_private.h

  • Committer: Package Import Robot
  • Author(s): Jeremy Bicha
  • Date: 2013-03-06 12:08:47 UTC
  • mfrom: (1.5.1) (14.1.8 experimental)
  • Revision ID: package-import@ubuntu.com-20130306120847-frjfaryb2zrotwcg
Tags: 2.66a-1ubuntu1
https://launchpad.net/bugs/1076930
https://launchpad.net/bugs/1089256
https://launchpad.net/bugs/1052743
https://launchpad.net/bugs/999024
* Resynchronize with Debian (LP: #1076930, #1089256, #1052743, #999024,
  #1122888, #1147084)
* debian/control:
  - Lower build-depends on libavcodec-dev since we're not
    doing the libav9 transition in Ubuntu yet

Show diffs side-by-side

added added

removed removed

Lines of Context:
source/blender/blenkernel/nla_private.h
39
39
typedef struct NlaEvalStrip {
40
40
        struct NlaEvalStrip *next, *prev;
41
41
        
42
 
        NlaTrack *track;                        /* track that this strip belongs to */
43
 
        NlaStrip *strip;                        /* strip that's being used */
44
 
        
45
 
        short track_index;                      /* the index of the track within the list */
46
 
        short strip_mode;                       /* which end of the strip are we looking at */
47
 
        
48
 
        float strip_time;                       /* time at which which strip is being evaluated */
 
42
        NlaTrack *track;            /* track that this strip belongs to */
 
43
        NlaStrip *strip;            /* strip that's being used */
 
44
        
 
45
        short track_index;          /* the index of the track within the list */
 
46
        short strip_mode;           /* which end of the strip are we looking at */
 
47
        
 
48
        float strip_time;           /* time at which which strip is being evaluated */
49
49
} NlaEvalStrip;
50
50
 
51
51
/* NlaEvalStrip->strip_mode */
52
52
enum {
53
 
                /* standard evaluation */
 
53
        /* standard evaluation */
54
54
        NES_TIME_BEFORE = -1,
55
55
        NES_TIME_WITHIN,
56
56
        NES_TIME_AFTER,
57
57
        
58
 
                /* transition-strip evaluations */
 
58
        /* transition-strip evaluations */
59
59
        NES_TIME_TRANSITION_START,
60
60
        NES_TIME_TRANSITION_END,
61
61
} eNlaEvalStrip_StripMode;
66
66
typedef struct NlaEvalChannel {
67
67
        struct NlaEvalChannel *next, *prev;
68
68
        
69
 
        PointerRNA ptr;                 /* pointer to struct containing property to use */
70
 
        PropertyRNA *prop;              /* RNA-property type to use (should be in the struct given) */
71
 
        int index;                              /* array index (where applicable) */
 
69
        PointerRNA ptr;         /* pointer to struct containing property to use */
 
70
        PropertyRNA *prop;      /* RNA-property type to use (should be in the struct given) */
 
71
        int index;              /* array index (where applicable) */
72
72
        
73
 
        float value;                    /* value of this channel */
 
73
        float value;            /* value of this channel */
74
74
} NlaEvalChannel;
75
75
 
76
76
/* --------------- NLA Functions (not to be used as a proper API) ----------------------- */
85
85
void nlastrip_evaluate(PointerRNA *ptr, ListBase *channels, ListBase *modifiers, NlaEvalStrip *nes);
86
86
void nladata_flush_channels(ListBase *channels);
87
87
 
88
 
#endif // __NLA_PRIVATE_H__
 
88
#endif  /* __NLA_PRIVATE_H__ */