Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergey Sharybin <sergey.vfx@gmail.com>2012-04-30 20:19:20 +0400
committerSergey Sharybin <sergey.vfx@gmail.com>2012-04-30 20:19:20 +0400
commitf111131ca68359e928056eff09a03d0eee8c681a (patch)
tree866483646a4fca238c0d1f4e22ff1bcb1ed0d6d2 /source/blender/makesdna
parent323aedb81e8f606cfb1357053891e989ff393099 (diff)
Camera tracking: initial commit of dopesheet view for clip editor
- Displays dopesheet information for selected tracks, and currently does not support any kind of editing. - Changed regions to use the whole main region for such views as curves and dopesheet. This allows to have own panels with tools/properties in this area. - Active clip is getting synchronized between different clip editor editors in the same screen, so updating of curve/dopesheet views happens automatically when one changes current clip in one of this editors. - Panels in toolbox and properties panels are now separated to rely on current view mode, but some operators and poll functions still need to be updated. - Added new screen called "Movie Tracking" where layout is configured to display timeline, main clip window, curves and dopesheet.
Diffstat (limited to 'source/blender/makesdna')
-rw-r--r--source/blender/makesdna/DNA_space_types.h5
-rw-r--r--source/blender/makesdna/DNA_tracking_types.h14
2 files changed, 16 insertions, 3 deletions
diff --git a/source/blender/makesdna/DNA_space_types.h b/source/blender/makesdna/DNA_space_types.h
index 947bf483866..c2fbc611bc3 100644
--- a/source/blender/makesdna/DNA_space_types.h
+++ b/source/blender/makesdna/DNA_space_types.h
@@ -520,9 +520,7 @@ typedef struct SpaceClip {
* defined when drawing and used for mouse position calculation */
/* movie postprocessing */
- int postproc_flag;
-
- int runtime_flag; /* different runtime flags */
+ int postproc_flag, pad2;
void *draw_context;
} SpaceClip;
@@ -916,6 +914,7 @@ enum {
/* SpaceClip->view */
#define SC_VIEW_CLIP 0
#define SC_VIEW_GRAPH 1
+#define SC_VIEW_DOPESHEET 2
/* SpaceClip->runtime_flag */
#define SC_GRAPH_BOTTOM (1<<0)
diff --git a/source/blender/makesdna/DNA_tracking_types.h b/source/blender/makesdna/DNA_tracking_types.h
index 2f099ed59f5..e8abee36716 100644
--- a/source/blender/makesdna/DNA_tracking_types.h
+++ b/source/blender/makesdna/DNA_tracking_types.h
@@ -193,6 +193,17 @@ typedef struct MovieTrackingStats {
char message[256];
} MovieTrackingStats;
+typedef struct MovieTrackingDopesheetChannel {
+ struct MovieTrackingDopesheetChannel *next, *prev;
+ MovieTrackingTrack *track;
+ int flag, pad;
+} MovieTrackingDopesheetChannel;
+
+typedef struct MovieTrackingDopesheet {
+ ListBase channels;
+ int tot_channel, pad;
+} MovieTrackingDopesheet;
+
typedef struct MovieTracking {
MovieTrackingSettings settings; /* different tracking-related settings */
MovieTrackingCamera camera; /* camera intrinsics */
@@ -205,6 +216,8 @@ typedef struct MovieTracking {
int objectnr, tot_object; /* index of active object and total number of objects */
MovieTrackingStats *stats; /* statistics displaying in clip editor */
+
+ MovieTrackingDopesheet dopesheet; /* dopesheet data */
} MovieTracking;
/* MovieTrackingCamera->units */
@@ -230,6 +243,7 @@ enum {
#define TRACK_CUSTOMCOLOR (1<<7)
#define TRACK_USE_2D_STAB (1<<8)
#define TRACK_PREVIEW_GRAYSCALE (1<<9)
+#define TRACK_DOPE_SEL (1<<10)
/* MovieTrackingTrack->tracker */
#define TRACKER_KLT 0