diff options
author | Campbell Barton <ideasman42@gmail.com> | 2021-04-16 05:06:26 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2021-04-16 05:19:02 +0300 |
commit | dc8a43c8755a5e880ff40765f878bf002a38096a (patch) | |
tree | ad5a998ebbd658c964904b41c35e29fab06415b3 /source/blender/makesrna/intern/rna_scene.c | |
parent | 43baf38758d2f1cba5c9d551da2321bb99ac3161 (diff) |
Fix RNA enum item callbacks not checking for NULL context
The NULL context is used to extract items for document generation.
Diffstat (limited to 'source/blender/makesrna/intern/rna_scene.c')
-rw-r--r-- | source/blender/makesrna/intern/rna_scene.c | 10 |
1 files changed, 9 insertions, 1 deletions
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]); |