diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2017-11-20 12:45:03 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2017-11-20 12:45:03 +0300 |
| commit | a8777f905846f80385fc90135e000c3169bbefc6 (patch) | |
| tree | 928a7db22a8553abd35f99a0afe2990be87d69ac /source/blender/editors/space_outliner/outliner_intern.h | |
| parent | c0c696b014e3c21b923a2c21fb33a18839a3faa3 (diff) | |
| parent | 65af15ad887b30e678db9acab75efc7897c9197e (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/editors/space_outliner/outliner_intern.h')
| -rw-r--r-- | source/blender/editors/space_outliner/outliner_intern.h | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/source/blender/editors/space_outliner/outliner_intern.h b/source/blender/editors/space_outliner/outliner_intern.h index 8d93f6bca55..1edb3c88396 100644 --- a/source/blender/editors/space_outliner/outliner_intern.h +++ b/source/blender/editors/space_outliner/outliner_intern.h @@ -196,7 +196,13 @@ eOLDrawState tree_element_type_active( TreeElement *te, TreeStoreElem *tselem, const eOLSetState set, bool recursive); eOLDrawState tree_element_active(struct bContext *C, struct Scene *scene, struct SceneLayer *sl, SpaceOops *soops, TreeElement *te, const eOLSetState set, const bool handle_all_types); -int outliner_item_activate_or_toggle_closed(struct bContext *C, int x, int y, bool extend, bool recursive); + +void outliner_item_do_activate_from_tree_element( + struct bContext *C, TreeElement *te, TreeStoreElem *tselem, + bool extend, bool recursive); +int outliner_item_do_activate_from_cursor( + struct bContext *C, const int mval[2], + bool extend, bool recursive); /* outliner_edit.c ---------------------------------------------- */ typedef void (*outliner_operation_cb)( |