archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

another function moved, should be last of the simple cases.

Browse Source 
km.item_from_id() --> km.items.from_id()
This commit is contained in:
Campbell Barton
2010-08-30 14:48:12 +00:00
parent 44eb9f5095
commit d59304e8e4
3 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
release/scripts/ui/space_userpref_keymap.py
View File

@@ -714,7 +714,7 @@ class WM_OT_keyitem_restore(bpy.types.Operator):
def execute(self, context): def execute(self, context):
wm = context.manager wm = context.manager
km = context.keymap km = context.keymap
kmi = km.item_from_id(self.properties.item_id) kmi = km.items.from_id(self.properties.item_id)
km.restore_item_to_default(kmi) km.restore_item_to_default(kmi)
@@ -755,7 +755,7 @@ class WM_OT_keyitem_remove(bpy.types.Operator):
def execute(self, context): def execute(self, context):
wm = context.manager wm = context.manager
km = context.keymap km = context.keymap
kmi = km.item_from_id(self.properties.item_id) kmi = km.items.from_id(self.properties.item_id)
km.items.remove(kmi) km.items.remove(kmi)
return {'FINISHED'} return {'FINISHED'}

7
source/blender/makesrna/intern/rna_wm.c
View File

@@ -1406,6 +1406,13 @@ static void rna_def_keymap_items(BlenderRNA *brna, PropertyRNA *cprop)
func= RNA_def_function(srna, "remove", "WM_keymap_remove_item"); func= RNA_def_function(srna, "remove", "WM_keymap_remove_item");
parm= RNA_def_pointer(func, "item", "KeyMapItem", "Item", ""); parm= RNA_def_pointer(func, "item", "KeyMapItem", "Item", "");
RNA_def_property_flag(parm, PROP_REQUIRED); RNA_def_property_flag(parm, PROP_REQUIRED);
func= RNA_def_function(srna, "from_id", "WM_keymap_item_find_id");
parm= RNA_def_property(func, "id", PROP_INT, PROP_NONE);
RNA_def_property_flag(parm, PROP_REQUIRED);
RNA_def_property_ui_text(parm, "id", "ID of the item");
parm= RNA_def_pointer(func, "item", "KeyMapItem", "Item", "");
RNA_def_function_return(func, parm);
} }

7
source/blender/makesrna/intern/rna_wm_api.c
View File

@@ -238,13 +238,6 @@ void RNA_api_keymap(StructRNA *srna)
parm= RNA_def_pointer(func, "keymap", "KeyMap", "Key Map", "Active key map."); parm= RNA_def_pointer(func, "keymap", "KeyMap", "Key Map", "Active key map.");
RNA_def_function_return(func, parm); RNA_def_function_return(func, parm);
func= RNA_def_function(srna, "item_from_id", "WM_keymap_item_find_id");
parm= RNA_def_property(func, "id", PROP_INT, PROP_NONE);
RNA_def_property_flag(parm, PROP_REQUIRED);
RNA_def_property_ui_text(parm, "id", "ID of the item");
parm= RNA_def_pointer(func, "item", "KeyMapItem", "Item", "");
RNA_def_function_return(func, parm);
func= RNA_def_function(srna, "copy_to_user", "WM_keymap_copy_to_user"); func= RNA_def_function(srna, "copy_to_user", "WM_keymap_copy_to_user");
parm= RNA_def_pointer(func, "keymap", "KeyMap", "Key Map", "User editable key map."); parm= RNA_def_pointer(func, "keymap", "KeyMap", "Key Map", "User editable key map.");
RNA_def_function_return(func, parm); RNA_def_function_return(func, parm);