diff options
| -rw-r--r-- | source/blender/editors/space_buttons/buttons_context.c | 7 | ||||
| -rw-r--r-- | source/blender/editors/space_buttons/space_buttons.c | 2 |
2 files changed, 5 insertions, 4 deletions
diff --git a/source/blender/editors/space_buttons/buttons_context.c b/source/blender/editors/space_buttons/buttons_context.c index 41d8ff9bc9e..c42e2531f25 100644 --- a/source/blender/editors/space_buttons/buttons_context.c +++ b/source/blender/editors/space_buttons/buttons_context.c @@ -877,7 +877,7 @@ int /*eContextResult*/ buttons_context(const bContext *C, return CTX_RESULT_OK; } if (CTX_data_equals(member, "scene")) { - /* Do not return one here if scene not found in path, + /* Do not return one here if scene is not found in path, * in this case we want to get default context scene! */ return set_pointer_type(path, result, &RNA_Scene); } @@ -886,8 +886,9 @@ int /*eContextResult*/ buttons_context(const bContext *C, return CTX_RESULT_OK; } if (CTX_data_equals(member, "collection")) { - set_pointer_type(path, result, &RNA_Collection); - return CTX_RESULT_OK; + /* Do not return one here if collection is not found in path, + * in this case we want to get default context collection! */ + return set_pointer_type(path, result, &RNA_Collection); } if (CTX_data_equals(member, "object")) { set_pointer_type(path, result, &RNA_Object); diff --git a/source/blender/editors/space_buttons/space_buttons.c b/source/blender/editors/space_buttons/space_buttons.c index 43d45db38e2..9db8f7efbb2 100644 --- a/source/blender/editors/space_buttons/space_buttons.c +++ b/source/blender/editors/space_buttons/space_buttons.c @@ -206,7 +206,7 @@ int ED_buttons_tabs_list(SpaceProperties *sbuts, short *context_tabs_array) context_tabs_array[length] = -1; length++; } - if (sbuts->pathflag & (1 << BCONTEXT_VIEW_LAYER)) { + if (sbuts->pathflag & (1 << BCONTEXT_COLLECTION)) { context_tabs_array[length] = BCONTEXT_COLLECTION; length++; } |