diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2012-02-17 19:51:48 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2012-02-17 19:51:48 +0400 |
| commit | 4c66e696fbcaefe40f0394fea8fc4a55bb7d6994 (patch) | |
| tree | e8f60920e276ec1fec3c8014b77790a6c790deba /source/blender/makesdna | |
| parent | 02987fd5e1fa3715d25bb7b9bd659fd509f40c57 (diff) | |
| parent | b7f3887a3a8a66aeba3a16ae5d76b934af3ccc7c (diff) | |
svn merge ^/trunk/blender -r44136:44189
Diffstat (limited to 'source/blender/makesdna')
| -rw-r--r-- | source/blender/makesdna/DNA_movieclip_types.h | 2 | ||||
| -rw-r--r-- | source/blender/makesdna/DNA_tracking_types.h | 9 |
2 files changed, 10 insertions, 1 deletions
diff --git a/source/blender/makesdna/DNA_movieclip_types.h b/source/blender/makesdna/DNA_movieclip_types.h index 80728cd9817..71029293d09 100644 --- a/source/blender/makesdna/DNA_movieclip_types.h +++ b/source/blender/makesdna/DNA_movieclip_types.h @@ -39,6 +39,7 @@ #include "DNA_tracking_types.h" struct anim; +struct AnimData; struct bGPdata; struct ImBuf; struct MovieClipProxy; @@ -61,6 +62,7 @@ typedef struct MovieClipProxy { typedef struct MovieClip { ID id; + struct AnimData *adt; /* animation data (must be immediately after id for utilities to use it) */ char name[1024]; /* file path, 1024 = FILE_MAX */ diff --git a/source/blender/makesdna/DNA_tracking_types.h b/source/blender/makesdna/DNA_tracking_types.h index 1b41131c07d..e81344d7d51 100644 --- a/source/blender/makesdna/DNA_tracking_types.h +++ b/source/blender/makesdna/DNA_tracking_types.h @@ -159,8 +159,10 @@ typedef struct MovieTrackingStabilization { float locinf, scaleinf, rotinf; /* influence on location, scale and rotation */ + int filter; /* filter used for pixel interpolation */ + /* some pre-computing run-time variables */ - int ok, pad; /* are precomputed values and scaled buf relevant? */ + int ok; /* are precomputed values and scaled buf relevant? */ float scale; /* autoscale factor */ struct ImBuf *scaleibuf; /* currently scaled ibuf */ @@ -258,6 +260,11 @@ enum { #define TRACKING_AUTOSCALE (1<<1) #define TRACKING_STABILIZE_ROTATION (1<<2) +/* MovieTrackingStrabilization->filter */ +#define TRACKING_FILTER_NEAREAST 0 +#define TRACKING_FILTER_BILINEAR 1 +#define TRACKING_FILTER_BICUBIC 2 + /* MovieTrackingReconstruction->flag */ #define TRACKING_RECONSTRUCTED (1<<0) |