diff options
author | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2010-04-18 06:03:19 +0400 |
---|---|---|
committer | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2010-04-18 06:03:19 +0400 |
commit | dfe2f8dc03267e041102837e92f547fb04881510 (patch) | |
tree | d9582c4667ce5b9e39e2adce40832aa4f44b4fe7 /source/blender/makesrna/intern/rna_wm.c | |
parent | d7e08f2d33207fdf76b1b597ef0de9dec26e3987 (diff) | |
parent | 00e46ef739cf2bfddb8805af056aa59fd3b3c71c (diff) |
Merged changes in the trunk up to revision 28247.
Diffstat (limited to 'source/blender/makesrna/intern/rna_wm.c')
-rw-r--r-- | source/blender/makesrna/intern/rna_wm.c | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/source/blender/makesrna/intern/rna_wm.c b/source/blender/makesrna/intern/rna_wm.c index 2420310c774..cad8f0910ee 100644 --- a/source/blender/makesrna/intern/rna_wm.c +++ b/source/blender/makesrna/intern/rna_wm.c @@ -612,6 +612,12 @@ static void rna_Operator_unregister(const bContext *C, StructRNA *type) if(!ot) return; + /* update while blender is running */ + if(C) { + WM_operator_stack_clear((bContext*)C); + WM_main_add_notifier(NC_SCREEN|NA_EDITED, NULL); + } + RNA_struct_free_extension(type, &ot->ext); idname= ot->idname; @@ -620,10 +626,6 @@ static void rna_Operator_unregister(const bContext *C, StructRNA *type) /* not to be confused with the RNA_struct_free that WM_operatortype_remove calls, they are 2 different srna's */ RNA_struct_free(&BLENDER_RNA, type); - - /* update while blender is running */ - if(C) - WM_main_add_notifier(NC_SCREEN|NA_EDITED, NULL); } static int operator_poll(bContext *C, wmOperatorType *ot) @@ -1338,10 +1340,6 @@ static void rna_def_keyconfig(BlenderRNA *brna) RNA_def_property_ui_text(prop, "Name", "Name of the key configuration"); RNA_def_struct_name_property(srna, prop); - prop= RNA_def_property(srna, "filter", PROP_STRING, PROP_NONE); - RNA_def_property_string_sdna(prop, NULL, "filter"); - RNA_def_property_ui_text(prop, "Filter", "Search term for filtering in the UI"); - prop= RNA_def_property(srna, "keymaps", PROP_COLLECTION, PROP_NONE); RNA_def_property_struct_type(prop, "KeyMap"); RNA_def_property_ui_text(prop, "Key Maps", "Key maps configured as part of this configuration"); |