diff options
author | Campbell Barton <ideasman42@gmail.com> | 2021-03-18 01:04:26 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2021-03-18 01:06:56 +0300 |
commit | 0c58ad8a34c55344262ac74fce87888beb464155 (patch) | |
tree | ee8060de1b62922175abf03a70d9e38f0e4c5d53 /source/blender/editors | |
parent | de6d6e171e950ab59e8499f310a91ee7fc18c9f8 (diff) |
Cleanup: remove unused common_restrict_check function
Since c10ad8e9eabea8a10d35efea3860cc345977e4f9 hiding edit-mode objects
is supported.
Although this function had already been removed in
aeb8e81f2741aabc95d14bce7a83cef45481959c.
Diffstat (limited to 'source/blender/editors')
-rw-r--r-- | source/blender/editors/space_outliner/outliner_edit.c | 30 | ||||
-rw-r--r-- | source/blender/editors/space_outliner/outliner_intern.h | 2 |
2 files changed, 0 insertions, 32 deletions
diff --git a/source/blender/editors/space_outliner/outliner_edit.c b/source/blender/editors/space_outliner/outliner_edit.c index 5501e52d69b..681f7fab18a 100644 --- a/source/blender/editors/space_outliner/outliner_edit.c +++ b/source/blender/editors/space_outliner/outliner_edit.c @@ -1105,36 +1105,6 @@ bool outliner_flag_flip(ListBase *lb, short flag) /** \} */ /* -------------------------------------------------------------------- */ -/** \name Restriction Column Utility - * \{ */ - -/* same check needed for both object operation and restrict column button func - * return 0 when in edit mode (cannot restrict view or select) - * otherwise return 1 */ -int common_restrict_check(bContext *C, Object *ob) -{ - /* Don't allow hide an object in edit mode, - * check the bugs (T22153 and T21609, T23977). - */ - Object *obedit = CTX_data_edit_object(C); - if (obedit && obedit == ob) { - /* found object is hidden, reset */ - if (ob->restrictflag & OB_RESTRICT_VIEWPORT) { - ob->restrictflag &= ~OB_RESTRICT_VIEWPORT; - } - /* found object is unselectable, reset */ - if (ob->restrictflag & OB_RESTRICT_SELECT) { - ob->restrictflag &= ~OB_RESTRICT_SELECT; - } - return 0; - } - - return 1; -} - -/** \} */ - -/* -------------------------------------------------------------------- */ /** \name Toggle Expanded (Outliner) Operator * \{ */ diff --git a/source/blender/editors/space_outliner/outliner_intern.h b/source/blender/editors/space_outliner/outliner_intern.h index 593c33bd3df..f65e273c1b5 100644 --- a/source/blender/editors/space_outliner/outliner_intern.h +++ b/source/blender/editors/space_outliner/outliner_intern.h @@ -349,8 +349,6 @@ void outliner_do_object_operation(struct bContext *C, struct ListBase *lb, outliner_operation_fn operation_fn); -int common_restrict_check(struct bContext *C, struct Object *ob); - int outliner_flag_is_any_test(ListBase *lb, short flag, const int curlevel); bool outliner_flag_set(ListBase *lb, short flag, short set); bool outliner_flag_flip(ListBase *lb, short flag); |