Merging r40572 through r40597 from trunk into soc-2011-tomato

[blender-staging.git] / source / blender / editors / include / UI_interface.h

diff --git a/source/blender/editors/include/UI_interface.h b/source/blender/editors/include/UI_interface.h
index 4a895472b33623eb61a7e21591b27eccee4d1e58..1e5224f4198aee15e65565875d1bc914e33e6fb0 100644 (file)
--- a/source/blender/editors/include/UI_interface.h
+++ b/source/blender/editors/include/UI_interface.h
@@ -224,18 +224,19 @@ typedef struct uiLayout uiLayout;
 #define TOGBUT         (37<<9)
 #define OPTION         (38<<9)
 #define OPTIONN                (39<<9)
+#define TRACKPREVIEW   (40<<9)
                /* buttons with value >= SEARCH_MENU don't get undo pushes */
-#define SEARCH_MENU    (40<<9)
-#define BUT_EXTRA      (41<<9)
-#define HSVCIRCLE      (42<<9)
-#define LISTBOX                (43<<9)
-#define LISTROW                (44<<9)
-#define HOTKEYEVT      (45<<9)
-#define BUT_IMAGE      (46<<9)
-#define HISTOGRAM      (47<<9)
-#define WAVEFORM       (48<<9)
-#define VECTORSCOPE    (49<<9)
-#define PROGRESSBAR    (50<<9)
+#define SEARCH_MENU    (41<<9)
+#define BUT_EXTRA      (42<<9)
+#define HSVCIRCLE      (43<<9)
+#define LISTBOX                (44<<9)
+#define LISTROW                (45<<9)
+#define HOTKEYEVT      (46<<9)
+#define BUT_IMAGE      (47<<9)
+#define HISTOGRAM      (48<<9)
+#define WAVEFORM       (49<<9)
+#define VECTORSCOPE    (50<<9)
+#define PROGRESSBAR    (51<<9)
 
 #define BUTTYPE                (63<<9)
 
@@ -752,6 +753,10 @@ void uiTemplateReportsBanner(uiLayout *layout, struct bContext *C);
 
 void uiTemplateList(uiLayout *layout, struct bContext *C, struct PointerRNA *ptr, const char *propname, struct PointerRNA *activeptr, const char *activeprop, int rows, int maxrows, int type);
 
+void uiTemplateMovieClip(struct uiLayout *layout, struct bContext *C, struct PointerRNA *ptr, const char *propname, int compact);
+void uiTemplateTrack(struct uiLayout *layout, struct PointerRNA *ptr, const char *propname);
+void uiTemplateMarker(struct uiLayout *layout, struct PointerRNA *ptr, const char *propname, PointerRNA *userptr, PointerRNA *trackptr, int cmpact);
+
 /* items */
 void uiItemO(uiLayout *layout, const char *name, int icon, const char *opname);
 void uiItemEnumO(uiLayout *layout, const char *opname, const char *name, int icon, const char *propname, int value);