[Bf-blender-cvs] [3a4fa403132] master: Fix T72258: Loading keymap crashes on startup

Campbell Barton noreply at git.blender.org
Tue Dec 10 02:02:42 CET 2019


Commit: 3a4fa4031325d747b857e6918430e3779d699410
Author: Campbell Barton
Date:   Tue Dec 10 11:56:22 2019 +1100
Branches: master
https://developer.blender.org/rB3a4fa4031325d747b857e6918430e3779d699410

Fix T72258: Loading keymap crashes on startup

===================================================================

M	source/blender/editors/space_outliner/outliner_tools.c

===================================================================

diff --git a/source/blender/editors/space_outliner/outliner_tools.c b/source/blender/editors/space_outliner/outliner_tools.c
index 476010a693d..234da323de6 100644
--- a/source/blender/editors/space_outliner/outliner_tools.c
+++ b/source/blender/editors/space_outliner/outliner_tools.c
@@ -1559,6 +1559,9 @@ static const EnumPropertyItem *outliner_id_operation_itemf(bContext *C,
   EnumPropertyItem *items = NULL;
   int totitem = 0;
 
+  if (C == NULL) {
+    return prop_id_op_types;
+  }
   for (const EnumPropertyItem *it = prop_id_op_types; it->identifier != NULL; it++) {
     if (!outliner_id_operation_item_poll(C, ptr, prop, it->value)) {
       continue;



More information about the Bf-blender-cvs mailing list