diff options
| author | Sergej Reich <sergej.reich@googlemail.com> | 2013-10-13 15:41:41 +0400 |
|---|---|---|
| committer | Sergej Reich <sergej.reich@googlemail.com> | 2013-10-13 15:41:41 +0400 |
| commit | 5d5176095e82b34499e15d74f1fb76d56f4d9508 (patch) | |
| tree | dd8c61741160804873601f6b6350661132ac1b2f /source/blender/editors/interface/interface_intern.h | |
| parent | bcbf976b48762c2f25df470c6d13a124bc868a66 (diff) | |
| parent | 42ac7164e30dcca565253aa265201aad497e5360 (diff) | |
svn merge -r60422:60726 ^/trunk/blender
Diffstat (limited to 'source/blender/editors/interface/interface_intern.h')
| -rw-r--r-- | source/blender/editors/interface/interface_intern.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/source/blender/editors/interface/interface_intern.h b/source/blender/editors/interface/interface_intern.h index 6382130cbbd..9cc16d82810 100644 --- a/source/blender/editors/interface/interface_intern.h +++ b/source/blender/editors/interface/interface_intern.h @@ -584,4 +584,8 @@ int ui_but_anim_expression_set(uiBut *but, const char *str); int ui_but_anim_expression_create(uiBut *but, const char *str); void ui_but_anim_autokey(struct bContext *C, uiBut *but, struct Scene *scene, float cfra); -#endif +/* interface_eyedropper.c */ +void UI_OT_eyedropper_color(struct wmOperatorType *ot); +void UI_OT_eyedropper_id(struct wmOperatorType *ot); + +#endif /* __INTERFACE_INTERN_H__ */ |