[Bf-blender-cvs] [dc8a43c8755] blender-v2.93-release: Fix RNA enum item callbacks not checking for NULL context
Campbell Barton
noreply at git.blender.org
Fri Apr 16 04:20:08 CEST 2021
Commit: dc8a43c8755a5e880ff40765f878bf002a38096a
Author: Campbell Barton
Date: Fri Apr 16 12:06:26 2021 +1000
Branches: blender-v2.93-release
https://developer.blender.org/rBdc8a43c8755a5e880ff40765f878bf002a38096a
Fix RNA enum item callbacks not checking for NULL context
The NULL context is used to extract items for document generation.
===================================================================
M source/blender/editors/space_outliner/outliner_edit.c
M source/blender/makesrna/intern/rna_scene.c
===================================================================
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]);
More information about the Bf-blender-cvs
mailing list