From c0d9ef65e95e808d4444892ada29a030215a5d17 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Wed, 27 Aug 2014 10:53:16 +1000 Subject: UI: Warn when using fallback category Scripts should be updated. --- source/blender/makesrna/intern/rna_ui.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'source/blender/makesrna/intern/rna_ui.c') diff --git a/source/blender/makesrna/intern/rna_ui.c b/source/blender/makesrna/intern/rna_ui.c index 03578649d2b..92c5530202b 100644 --- a/source/blender/makesrna/intern/rna_ui.c +++ b/source/blender/makesrna/intern/rna_ui.c @@ -201,9 +201,6 @@ static StructRNA *rna_Panel_register(Main *bmain, ReportList *reports, void *dat /* We have to set default context! Else we get a void string... */ strcpy(dummypt.translation_context, BLF_I18NCONTEXT_DEFAULT_BPYRNA); - /* We have to set default category! Else we get a void string, and panel goes everywhere! */ - strcpy(dummypt.category, PNL_DEFAULT_CATEGORY); - /* validate the python class */ if (validate(&dummyptr, data, have_function) != 0) return NULL; @@ -213,7 +210,12 @@ static StructRNA *rna_Panel_register(Main *bmain, ReportList *reports, void *dat identifier, (int)sizeof(dummypt.idname)); return NULL; } - + + if ((dummypt.category[0] == '\0') && (dummypt.region_type == RGN_TYPE_TOOLS)) { + /* Use a fallback, otherwise an empty value will draw the panel in every category. */ + strcpy(dummypt.category, PNL_CATEGORY_FALLBACK); + } + if (!(art = region_type_find(reports, dummypt.space_type, dummypt.region_type))) return NULL; @@ -990,7 +992,6 @@ static void rna_def_panel(BlenderRNA *brna) prop = RNA_def_property(srna, "bl_category", PROP_STRING, PROP_NONE); RNA_def_property_string_sdna(prop, NULL, "type->category"); - RNA_def_property_string_default(prop, PNL_DEFAULT_CATEGORY); RNA_def_property_flag(prop, PROP_REGISTER_OPTIONAL); prop = RNA_def_property(srna, "bl_space_type", PROP_ENUM, PROP_NONE); -- cgit v1.2.3