From 0c03fa78c10f04283512f2a5a4557d86c72d6f29 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Fri, 25 Mar 2011 02:12:44 +0000 Subject: fix [#26601] Python error when use of autocomplete Was a naming collision with 'keys' python method, reserve keys/items/values/get for python. Updated animsys_update.py for shapekey data paths. renamed: Particle.hair --> hair_keys Particle.keys --> particle_keys Key.keys --> key_blocks EnumProperty.items --> enum_items KeyMap.items --> keymap_items noted: http://wiki.blender.org/index.php/Dev:2.5/Py/API/Updates#Since_2.56a --- source/blender/makesrna/intern/rna_wm.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'source/blender/makesrna/intern/rna_wm.c') diff --git a/source/blender/makesrna/intern/rna_wm.c b/source/blender/makesrna/intern/rna_wm.c index 2a51d8b682b..0d1463428bb 100644 --- a/source/blender/makesrna/intern/rna_wm.c +++ b/source/blender/makesrna/intern/rna_wm.c @@ -1664,7 +1664,8 @@ static void rna_def_keyconfig(BlenderRNA *brna) RNA_def_property_enum_items(prop, region_type_items); RNA_def_property_ui_text(prop, "Region Type", "Optional region type keymap is associated with"); - prop= RNA_def_property(srna, "items", PROP_COLLECTION, PROP_NONE); + prop= RNA_def_property(srna, "keymap_items", PROP_COLLECTION, PROP_NONE); + RNA_def_property_collection_sdna(prop, NULL, "items", NULL); RNA_def_property_struct_type(prop, "KeyMapItem"); RNA_def_property_ui_text(prop, "Items", "Items in the keymap, linking an operator to an input event"); rna_def_keymap_items(brna, prop); -- cgit v1.2.3