1 files changed, 7 insertions, 3 deletions
diff --git a/source/blender/editors/geometry/geometry_attributes.c b/source/blender/editors/geometry/geometry_attributes.c
index 12f6bb90677..b2ecee90a57 100644
--- a/source/blender/editors/geometry/geometry_attributes.c
+++ b/source/blender/editors/geometry/geometry_attributes.c
@@ -52,12 +52,16 @@ static const EnumPropertyItem *geometry_attribute_domain_itemf(bContext *C,
                                                                PropertyRNA *UNUSED(prop),
                                                                bool *r_free)
 {
+  if (C == NULL) {
+    return DummyRNA_NULL_items;
+  }
+
   Object *ob = ED_object_context(C);
-  if (ob != NULL) {
-    return rna_enum_attribute_domain_itemf(ob->data, r_free);
+  if (ob == NULL) {
+    return DummyRNA_NULL_items;
   }
 
-  return DummyRNA_NULL_items;
+  return rna_enum_attribute_domain_itemf(ob->data, r_free);
 }
 
 static int geometry_attribute_add_exec(bContext *C, wmOperator *op)