archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Fix T86645: Executing "Operator Cheat Sheet" Crashes Blender

Browse Source 
The "Operator Cheat Sheet" operator collects info about all operators, and as
part of that executes the callbacks to create dynamic enums. The callback to
enumerate the Outliner ID operations depends on Outliner context. If this isn't
available, it can just return a context-less version of the enum, that is, a
static enum with all available items. This was already done in case no context
is available at all.
This commit is contained in:
Julian Eisel
2021-03-17 12:44:28 +01:00
parent 2a4bde04c5
commit 20bf736ff8
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
source/blender/editors/space_outliner/outliner_tools.c
View File

@@ -1854,7 +1854,7 @@ static bool outliner_id_operation_item_poll(bContext *C,
} }
return false; return false;
case OUTLINER_IDOP_SINGLE: case OUTLINER_IDOP_SINGLE:
if (!space_outliner || ELEM(space_outliner->outlinevis, SO_SCENES, SO_VIEW_LAYER)) { if (ELEM(space_outliner->outlinevis, SO_SCENES, SO_VIEW_LAYER)) {
return true; return true;
} }
/* TODO(dalai): enable in the few cases where this can be supported /* TODO(dalai): enable in the few cases where this can be supported
@@ -1873,7 +1873,7 @@ static const EnumPropertyItem *outliner_id_operation_itemf(bContext *C,
EnumPropertyItem *items = NULL; EnumPropertyItem *items = NULL;
int totitem = 0; int totitem = 0;
if (C == NULL) { if ((C == NULL) || (ED_operator_outliner_active(C) == false)) {
return prop_id_op_types; return prop_id_op_types;
} }
for (const EnumPropertyItem *it = prop_id_op_types; it->identifier != NULL; it++) { for (const EnumPropertyItem *it = prop_id_op_types; it->identifier != NULL; it++) {