diff options
| author | Tianwei Shen <shentianweipku@gmail.com> | 2016-09-26 19:00:49 +0300 |
|---|---|---|
| committer | Tianwei Shen <shentianweipku@gmail.com> | 2016-09-26 19:00:49 +0300 |
| commit | 4f69557528893f8d52cac16f77bac70161aac3e1 (patch) | |
| tree | 820a3d2b16f3e9e14e68f1b299d7c882fbbb7d1c /source/blender/editors/include | |
| parent | 3bbc836b2fd95bfa6f25691b4a32951881e11bfc (diff) | |
| parent | 7f76f6f2490a4375dc4c5e0f61de7daa7a75a9c2 (diff) | |
Merge branch 'master' into soc-2016-multiview
- revise code accordingly with the 2.78 release
Diffstat (limited to 'source/blender/editors/include')
| -rw-r--r-- | source/blender/editors/include/UI_interface.h | 8 | ||||
| -rw-r--r-- | source/blender/editors/include/UI_resources.h | 2 |
2 files changed, 3 insertions, 7 deletions
diff --git a/source/blender/editors/include/UI_interface.h b/source/blender/editors/include/UI_interface.h index ad4066fb31c..fd5351394c3 100644 --- a/source/blender/editors/include/UI_interface.h +++ b/source/blender/editors/include/UI_interface.h @@ -1021,19 +1021,13 @@ void ED_keymap_ui(struct wmKeyConfig *keyconf); void UI_drop_color_copy(struct wmDrag *drag, struct wmDropBox *drop); int UI_drop_color_poll(struct bContext *C, struct wmDrag *drag, const struct wmEvent *event); -/* UI_OT_space_context_cycle direction */ -enum { - SPACE_CONTEXT_CYCLE_PREV, - SPACE_CONTEXT_CYCLE_NEXT, -}; - bool UI_context_copy_to_selected_list( struct bContext *C, struct PointerRNA *ptr, struct PropertyRNA *prop, struct ListBase *r_lb, bool *r_use_path_from_id, char **r_path); /* Helpers for Operators */ uiBut *UI_context_active_but_get(const struct bContext *C); -void UI_context_active_but_prop_get( +uiBut *UI_context_active_but_prop_get( const struct bContext *C, struct PointerRNA *r_ptr, struct PropertyRNA **r_prop, int *r_index); void UI_context_active_but_prop_handle(struct bContext *C); diff --git a/source/blender/editors/include/UI_resources.h b/source/blender/editors/include/UI_resources.h index 50cee5c16a1..a5ea4e7ca9b 100644 --- a/source/blender/editors/include/UI_resources.h +++ b/source/blender/editors/include/UI_resources.h @@ -300,6 +300,8 @@ enum { TH_METADATA_BG, TH_METADATA_TEXT, + TH_EDGE_BEVEL, + TH_VERTEX_BEVEL, /* color theme for linked markers */ TH_LINKED_MARKER, TH_SEL_LINKED_MARKER |