diff options
author | Campbell Barton <ideasman42@gmail.com> | 2021-04-16 05:20:38 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2021-04-16 05:20:38 +0300 |
commit | cb4646a6dfccbd70172f54669740596b962245d8 (patch) | |
tree | b0036cf27eb5f7f74ed5197f31d942a2de6144fc /source/blender | |
parent | 0567f2b0bb86d187f77d348cf36a099f79445002 (diff) | |
parent | dc8a43c8755a5e880ff40765f878bf002a38096a (diff) |
Merge branch 'blender-v2.93-release'
Diffstat (limited to 'source/blender')
-rw-r--r-- | source/blender/editors/space_outliner/outliner_edit.c | 4 | ||||
-rw-r--r-- | source/blender/makesrna/intern/rna_scene.c | 10 |
2 files changed, 13 insertions, 1 deletions
diff --git a/source/blender/editors/space_outliner/outliner_edit.c b/source/blender/editors/space_outliner/outliner_edit.c index 7fe66b017a4..0c97fdc1c18 100644 --- a/source/blender/editors/space_outliner/outliner_edit.c +++ b/source/blender/editors/space_outliner/outliner_edit.c @@ -665,6 +665,10 @@ static const EnumPropertyItem *outliner_id_itemf(bContext *C, PropertyRNA *UNUSED(prop), bool *r_free) { + if (C == NULL) { + return DummyRNA_NULL_items; + } + EnumPropertyItem item_tmp = {0}, *item = NULL; int totitem = 0; int i = 0; diff --git a/source/blender/makesrna/intern/rna_scene.c b/source/blender/makesrna/intern/rna_scene.c index 1919c6544b2..be7c938a525 100644 --- a/source/blender/makesrna/intern/rna_scene.c +++ b/source/blender/makesrna/intern/rna_scene.c @@ -2483,6 +2483,10 @@ const EnumPropertyItem *rna_TransformOrientation_itemf(bContext *C, PropertyRNA *UNUSED(prop), bool *r_free) { + if (C == NULL) { + return rna_enum_transform_orientation_items; + } + Scene *scene; if (ptr->owner_id && (GS(ptr->owner_id->name) == ID_SCE)) { scene = (Scene *)ptr->owner_id; @@ -2493,11 +2497,15 @@ const EnumPropertyItem *rna_TransformOrientation_itemf(bContext *C, return rna_TransformOrientation_impl_itemf(scene, false, r_free); } -const EnumPropertyItem *rna_TransformOrientation_with_scene_itemf(bContext *UNUSED(C), +const EnumPropertyItem *rna_TransformOrientation_with_scene_itemf(bContext *C, PointerRNA *ptr, PropertyRNA *UNUSED(prop), bool *r_free) { + if (C == NULL) { + return rna_enum_transform_orientation_items; + } + Scene *scene = (Scene *)ptr->owner_id; TransformOrientationSlot *orient_slot = ptr->data; bool include_default = (orient_slot != &scene->orientation_slots[SCE_ORIENT_DEFAULT]); |