[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [31667] trunk/blender: another function moved, should be last of the simple cases.

[Campbell Barton]

Revision: 31667
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=31667
Author:   campbellbarton
Date:     2010-08-30 16:48:12 +0200 (Mon, 30 Aug 2010)

Log Message:
-----------
another function moved, should be last of the simple cases.
 km.item_from_id() --> km.items.from_id()

Modified Paths:
--------------
    trunk/blender/release/scripts/ui/space_userpref_keymap.py
    trunk/blender/source/blender/makesrna/intern/rna_wm.c
    trunk/blender/source/blender/makesrna/intern/rna_wm_api.c

Modified: trunk/blender/release/scripts/ui/space_userpref_keymap.py
===================================================================
--- trunk/blender/release/scripts/ui/space_userpref_keymap.py	2010-08-30 14:33:46 UTC (rev 31666)
+++ trunk/blender/release/scripts/ui/space_userpref_keymap.py	2010-08-30 14:48:12 UTC (rev 31667)
@@ -714,7 +714,7 @@
     def execute(self, context):
         wm = context.manager
         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)
 
@@ -755,7 +755,7 @@
     def execute(self, context):
         wm = context.manager
         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)
         return {'FINISHED'}
 

Modified: trunk/blender/source/blender/makesrna/intern/rna_wm.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_wm.c	2010-08-30 14:33:46 UTC (rev 31666)
+++ trunk/blender/source/blender/makesrna/intern/rna_wm.c	2010-08-30 14:48:12 UTC (rev 31667)
@@ -1406,6 +1406,13 @@
 	func= RNA_def_function(srna, "remove", "WM_keymap_remove_item");
 	parm= RNA_def_pointer(func, "item", "KeyMapItem", "Item", "");
 	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);
 	
 }
 

Modified: trunk/blender/source/blender/makesrna/intern/rna_wm_api.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_wm_api.c	2010-08-30 14:33:46 UTC (rev 31666)
+++ trunk/blender/source/blender/makesrna/intern/rna_wm_api.c	2010-08-30 14:48:12 UTC (rev 31667)
@@ -238,13 +238,6 @@
 	parm= RNA_def_pointer(func, "keymap", "KeyMap", "Key Map", "Active key map.");
 	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");
 	parm= RNA_def_pointer(func, "keymap", "KeyMap", "Key Map", "User editable key map.");
 	RNA_def_function_return(func, parm);