diff options
| author | Tianwei Shen <shentianweipku@gmail.com> | 2016-09-20 11:15:15 +0300 |
|---|---|---|
| committer | Tianwei Shen <shentianweipku@gmail.com> | 2016-09-20 11:15:15 +0300 |
| commit | 3bbc836b2fd95bfa6f25691b4a32951881e11bfc (patch) | |
| tree | 7ebbec9617bad9e70daea83b9d608da477a55643 /source/blender/editors/include | |
| parent | 49fe9a94d286b9dfc046453de0a6eb2c24cd2aa3 (diff) | |
| parent | e12f5b699d5a2eea045b584ebc7264bddcfb994d (diff) | |
Merge branch 'master' into soc-2016-multiview
Diffstat (limited to 'source/blender/editors/include')
| -rw-r--r-- | source/blender/editors/include/ED_util.h | 3 | ||||
| -rw-r--r-- | source/blender/editors/include/UI_interface.h | 4 |
2 files changed, 2 insertions, 5 deletions
diff --git a/source/blender/editors/include/ED_util.h b/source/blender/editors/include/ED_util.h index b6b80b93e0b..f5968397f65 100644 --- a/source/blender/editors/include/ED_util.h +++ b/source/blender/editors/include/ED_util.h @@ -78,9 +78,6 @@ void undo_editmode_push(struct bContext *C, const char *name, void undo_editmode_clear(void); -/* cut-paste buffer free */ -void ED_clipboard_posebuf_free(void); - /* ************** XXX OLD CRUFT WARNING ************* */ void apply_keyb_grid(int shift, int ctrl, float *val, float fac1, float fac2, float fac3, int invert); diff --git a/source/blender/editors/include/UI_interface.h b/source/blender/editors/include/UI_interface.h index 26a6fdd7d1f..ad4066fb31c 100644 --- a/source/blender/editors/include/UI_interface.h +++ b/source/blender/editors/include/UI_interface.h @@ -161,13 +161,13 @@ enum { UI_BUT_NODE_LINK = (1 << 8), UI_BUT_NODE_ACTIVE = (1 << 9), UI_BUT_DRAG_LOCK = (1 << 10), - UI_BUT_DISABLED = (1 << 11), + UI_BUT_DISABLED = (1 << 11), /* grayed out and uneditable */ UI_BUT_COLOR_LOCK = (1 << 12), UI_BUT_ANIMATED = (1 << 13), UI_BUT_ANIMATED_KEY = (1 << 14), UI_BUT_DRIVEN = (1 << 15), UI_BUT_REDALERT = (1 << 16), - UI_BUT_INACTIVE = (1 << 17), + UI_BUT_INACTIVE = (1 << 17), /* grayed out but still editable */ UI_BUT_LAST_ACTIVE = (1 << 18), UI_BUT_UNDO = (1 << 19), UI_BUT_IMMEDIATE = (1 << 20), |