diff options
| author | Matt Ebb <matt@mke3.net> | 2010-01-19 04:32:06 +0300 |
|---|---|---|
| committer | Matt Ebb <matt@mke3.net> | 2010-01-19 04:32:06 +0300 |
| commit | aab8196a1c16a1695a168c486fc6883953f97722 (patch) | |
| tree | bcd6de7e916feba5f068936eb7e289605b0fb87a /source/blender/editors/include | |
| parent | 849024df83602758f134695495eb0b19a6993421 (diff) | |
Finished some work from the weekend to keep local tree clean..
* Added a generic 'histogram' ui control, currently available in new image editor
'scopes' region (shortcut P). Shows the histogram of the currently viewed image.
It's a baby step in unifying the functionality and code from the sequence editor,
so eventually we can migrate the sequence preview to the image editor too,
like compositor.
Still a couple of rough edges to tweak, regarding when it updates. Also would
be very nice to have this region as a partially transparent overlapping region...
Diffstat (limited to 'source/blender/editors/include')
| -rw-r--r-- | source/blender/editors/include/UI_interface.h | 2 | ||||
| -rw-r--r-- | source/blender/editors/include/UI_resources.h | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/source/blender/editors/include/UI_interface.h b/source/blender/editors/include/UI_interface.h index 5344c1a617f..66878a26db1 100644 --- a/source/blender/editors/include/UI_interface.h +++ b/source/blender/editors/include/UI_interface.h @@ -216,6 +216,7 @@ typedef struct uiLayout uiLayout; #define LISTROW (44<<9) #define HOTKEYEVT (45<<9) #define BUT_IMAGE (46<<9) +#define HISTOGRAM (47<<9) #define BUTTYPE (63<<9) @@ -654,6 +655,7 @@ uiLayout *uiTemplateModifier(uiLayout *layout, struct PointerRNA *ptr); uiLayout *uiTemplateConstraint(uiLayout *layout, struct PointerRNA *ptr); void uiTemplatePreview(uiLayout *layout, struct ID *id, struct ID *parent, struct MTex *slot); void uiTemplateColorRamp(uiLayout *layout, struct PointerRNA *ptr, char *propname, int expand); +void uiTemplateHistogram(uiLayout *layout, struct PointerRNA *ptr, char *propname, int expand); void uiTemplateCurveMapping(uiLayout *layout, struct PointerRNA *ptr, char *propname, int type, int levels, int brush); void uiTemplateColorWheel(uiLayout *layout, struct PointerRNA *ptr, char *propname, int value_slider); void uiTemplateTriColorSet(uiLayout *layout, struct PointerRNA *ptr, char *propname); diff --git a/source/blender/editors/include/UI_resources.h b/source/blender/editors/include/UI_resources.h index ad06e56dfa3..e78ff664f3c 100644 --- a/source/blender/editors/include/UI_resources.h +++ b/source/blender/editors/include/UI_resources.h @@ -207,6 +207,8 @@ enum { TH_DOPESHEET_CHANNELOB, TH_DOPESHEET_CHANNELSUBOB, + + TH_PREVIEW_BACK, }; /* XXX WARNING: previous is saved in file, so do not change order! */ |