patch [#23522] UI fixing for recent Python API changes
authorCampbell Barton <ideasman42@gmail.com>
Fri, 27 Aug 2010 22:12:59 +0000 (22:12 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Fri, 27 Aug 2010 22:12:59 +0000 (22:12 +0000)
from Filiciss Muhgue (filiciss)

release/scripts/presets/interaction/blender.py
release/scripts/presets/interaction/maya.py
release/scripts/ui/space_sequencer.py

index 229aa657b2fec211b88ed9eb0c6413651318a904..af905a89b68da3130994f2d2006723213990d9dd 100644 (file)
@@ -2,7 +2,7 @@
 import bpy
 
 wm = bpy.context.manager
-wm.active_keyconfig = wm.keyconfigs['Blender']
+wm.keyconfigs.active = wm.keyconfigs['Blender']
 
 bpy.context.user_preferences.view.use_mouse_auto_depth = False
 bpy.context.user_preferences.view.use_zoom_to_mouse = False
index 4fcf987c9b20d466b0f1db9fc7038e67071cd93f..7f5b6e8c79c6f7f327854bcb2b30de9cffd49bd0 100644 (file)
@@ -7,7 +7,7 @@ kc = wm.add_keyconfig('Maya')
 # Map 3D View
 km = kc.add_keymap('3D View', space_type='VIEW_3D', region_type='WINDOW', modal=False)
 
-kmi = km.items.add('view3d.show_manipulator', 'LEFTMOUSE', 'PRESS', any=True)
+kmi = km.items.add('view3d.manipulator', 'LEFTMOUSE', 'PRESS', any=True)
 kmi.properties.release_confirm = True
 kmi = km.items.add('view3d.cursor3d', 'ACTIONMOUSE', 'PRESS')
 kmi = km.items.add('view3d.rotate', 'LEFTMOUSE', 'PRESS', alt=True)
index ec607629757c4543c18d2465e6019a232387b313..34100da577207f0effd0dc1cb5bb30ba2d5ffffb 100644 (file)
@@ -743,7 +743,7 @@ class SEQUENCER_PT_proxy(SequencerButtonsPanel, bpy.types.Panel):
         flow.prop(strip, "use_proxy_custom_directory")
         flow.prop(strip, "use_proxy_custom_file")
         if strip.proxy: # TODO - need to add this somehow
-            if strip.proxy_custom_directory and not strip.use_proxy_custom_file:
+            if strip.use_proxy_custom_directory and not strip.use_proxy_custom_file:
                 flow.prop(strip.proxy, "directory")
             if strip.use_proxy_custom_file:
                 flow.prop(strip.proxy, "filepath")