[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [36768] trunk/blender/release/scripts/ startup/bl_ui: py/ui edit: change InputKeyMapPanel to be a mix-in class only (not a subclass of Panel ), it messes up re-registering panels.

[Campbell Barton]

Revision: 36768
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=36768
Author:   campbellbarton
Date:     2011-05-19 09:52:11 +0000 (Thu, 19 May 2011)
Log Message:
-----------
py/ui edit: change InputKeyMapPanel to be a mix-in class only (not a subclass of Panel), it messes up re-registering panels.

Modified Paths:
--------------
    trunk/blender/release/scripts/startup/bl_ui/space_userpref.py
    trunk/blender/release/scripts/startup/bl_ui/space_userpref_keymap.py

Modified: trunk/blender/release/scripts/startup/bl_ui/space_userpref.py
===================================================================
--- trunk/blender/release/scripts/startup/bl_ui/space_userpref.py	2011-05-19 08:50:32 UTC (rev 36767)
+++ trunk/blender/release/scripts/startup/bl_ui/space_userpref.py	2011-05-19 09:52:11 UTC (rev 36768)
@@ -752,7 +752,7 @@
 from bl_ui.space_userpref_keymap import InputKeyMapPanel
 
 
-class USERPREF_PT_input(InputKeyMapPanel):
+class USERPREF_PT_input(bpy.types.Panel, InputKeyMapPanel):
     bl_space_type = 'USER_PREFERENCES'
     bl_label = "Input"
 

Modified: trunk/blender/release/scripts/startup/bl_ui/space_userpref_keymap.py
===================================================================
--- trunk/blender/release/scripts/startup/bl_ui/space_userpref_keymap.py	2011-05-19 08:50:32 UTC (rev 36767)
+++ trunk/blender/release/scripts/startup/bl_ui/space_userpref_keymap.py	2011-05-19 09:52:11 UTC (rev 36768)
@@ -138,7 +138,7 @@
         bpy.types.Menu.draw_preset(self, context)
 
 
-class InputKeyMapPanel(bpy.types.Panel):
+class InputKeyMapPanel:
     bl_space_type = 'USER_PREFERENCES'
     bl_label = "Input"
     bl_region_type = 'WINDOW'