[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [31778] trunk/blender/release/scripts/ui/ space_userpref_keymap.py: display_properties was being re-defined for each keymap item.

Campbell Barton ideasman42 at gmail.com
Mon Sep 6 08:04:06 CEST 2010


Revision: 31778
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=31778
Author:   campbellbarton
Date:     2010-09-06 08:04:05 +0200 (Mon, 06 Sep 2010)

Log Message:
-----------
display_properties was being re-defined for each keymap item.

Modified Paths:
--------------
    trunk/blender/release/scripts/ui/space_userpref_keymap.py

Modified: trunk/blender/release/scripts/ui/space_userpref_keymap.py
===================================================================
--- trunk/blender/release/scripts/ui/space_userpref_keymap.py	2010-09-06 05:40:52 UTC (rev 31777)
+++ trunk/blender/release/scripts/ui/space_userpref_keymap.py	2010-09-06 06:04:05 UTC (rev 31778)
@@ -211,6 +211,19 @@
                 for entry in children:
                     self.draw_entry(display_keymaps, entry, col, level + 1)
 
+    @staticmethod
+    def draw_kmi_properties(box, properties, title=None):
+        box.separator()
+        if title:
+            box.label(text=title)
+        flow = box.column_flow(columns=2)
+        for pname, value in properties.bl_rna.properties.items():
+            if pname != "rna_type" and not properties.is_property_hidden(pname):
+                if isinstance(value, bpy.types.OperatorProperties):
+                    __class__.draw_kmi_properties(box, value, title=pname)
+                else:
+                    flow.prop(properties, pname)
+
     def draw_kmi(self, display_keymaps, kc, km, kmi, layout, level):
         map_type = kmi.map_type
 
@@ -293,22 +306,10 @@
                 subrow.prop(kmi, "oskey", text="Cmd")
                 subrow.prop(kmi, "key_modifier", text="", event=True)
 
-            def display_properties(properties, title=None):
-                box.separator()
-                if title:
-                    box.label(text=title)
-                flow = box.column_flow(columns=2)
-                for pname, value in properties.bl_rna.properties.items():
-                    if pname != "rna_type" and not properties.is_property_hidden(pname):
-                        if isinstance(value, bpy.types.OperatorProperties):
-                            display_properties(value, title=pname)
-                        else:
-                            flow.prop(properties, pname)
-
             # Operator properties
             props = kmi.properties
             if props is not None:
-                display_properties(props)
+                __class__.draw_kmi_properties(box, props)
 
             # Modal key maps attached to this operator
             if not km.is_modal:
@@ -387,7 +388,6 @@
         lines = []
 
     for pname, value in properties.items():
-        print()
         if not properties.is_property_hidden(pname):
             if isinstance(value, bpy.types.OperatorProperties):
                 export_properties(prefix + "." + pname, value, lines)





More information about the Bf-blender-cvs mailing list