[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [31664] trunk/blender: - keymap import/ export works again (broke with own api changes)

Campbell Barton ideasman42 at gmail.com
Mon Aug 30 15:50:59 CEST 2010


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

Log Message:
-----------
- keymap import/export works again (broke with own api changes)
- function renames, move WM functions into collections wm.add_keymap() --> wm.keymaps.new()
  note: new is used for named items in a collection, which return the result.
- Action.get_frame_range() is now a readonly property 'frame_range', floats rather then ints.

Modified Paths:
--------------
    trunk/blender/release/scripts/io/export_fbx.py
    trunk/blender/release/scripts/presets/interaction/maya.py
    trunk/blender/release/scripts/ui/space_userpref_keymap.py
    trunk/blender/source/blender/makesrna/intern/rna_action.c
    trunk/blender/source/blender/makesrna/intern/rna_action_api.c
    trunk/blender/source/blender/makesrna/intern/rna_scene.c
    trunk/blender/source/blender/makesrna/intern/rna_wm.c
    trunk/blender/source/blender/makesrna/intern/rna_wm_api.c
    trunk/blender/source/blender/windowmanager/WM_api.h
    trunk/blender/source/blender/windowmanager/intern/wm.c
    trunk/blender/source/blender/windowmanager/intern/wm_keymap.c

Modified: trunk/blender/release/scripts/io/export_fbx.py
===================================================================
--- trunk/blender/release/scripts/io/export_fbx.py	2010-08-30 13:07:28 UTC (rev 31663)
+++ trunk/blender/release/scripts/io/export_fbx.py	2010-08-30 13:50:59 UTC (rev 31664)
@@ -2760,7 +2760,9 @@
                 else:
                     file.write('\n\tTake: "%s" {' % sane_takename(blenAction))
 
-                act_start, act_end = blenAction.get_frame_range()
+                act_start, act_end = blenAction.frame_range
+                act_start = int(act_start)
+                act_end = int(act_end)
 # 				tmp = blenAction.getFrameNumbers()
 # 				if tmp:
 # 					act_start =	min(tmp)

Modified: trunk/blender/release/scripts/presets/interaction/maya.py
===================================================================
--- trunk/blender/release/scripts/presets/interaction/maya.py	2010-08-30 13:07:28 UTC (rev 31663)
+++ trunk/blender/release/scripts/presets/interaction/maya.py	2010-08-30 13:50:59 UTC (rev 31664)
@@ -2,377 +2,377 @@
 import bpy
 
 wm = bpy.context.manager
-kc = wm.add_keyconfig('Maya')
+kc = wm.keyconfigs.new('Maya')
 
 # Map 3D View
-km = kc.add_keymap('3D View', space_type='VIEW_3D', region_type='WINDOW', modal=False)
+km = kc.keymaps.new('3D View', space_type='VIEW_3D', region_type='WINDOW', modal=False)
 
-kmi = km.items.add('view3d.manipulator', 'LEFTMOUSE', 'PRESS', any=True)
+kmi = km.items.new('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)
-kmi = km.items.add('view3d.move', 'MIDDLEMOUSE', 'PRESS', alt=True)
-kmi = km.items.add('view3d.zoom', 'RIGHTMOUSE', 'PRESS', alt=True)
-kmi = km.items.add('view3d.view_selected', 'NUMPAD_PERIOD', 'PRESS')
-kmi = km.items.add('view3d.view_center_cursor', 'NUMPAD_PERIOD', 'PRESS', ctrl=True)
-kmi = km.items.add('view3d.fly', 'F', 'PRESS', shift=True)
-kmi = km.items.add('view3d.smoothview', 'TIMER1', 'ANY', any=True)
-kmi = km.items.add('view3d.rotate', 'TRACKPADPAN', 'ANY', alt=True)
-kmi = km.items.add('view3d.rotate', 'MOUSEROTATE', 'ANY')
-kmi = km.items.add('view3d.move', 'TRACKPADPAN', 'ANY')
-kmi = km.items.add('view3d.zoom', 'TRACKPADZOOM', 'ANY')
-kmi = km.items.add('view3d.zoom', 'NUMPAD_PLUS', 'PRESS')
+kmi = km.items.new('view3d.cursor3d', 'ACTIONMOUSE', 'PRESS')
+kmi = km.items.new('view3d.rotate', 'LEFTMOUSE', 'PRESS', alt=True)
+kmi = km.items.new('view3d.move', 'MIDDLEMOUSE', 'PRESS', alt=True)
+kmi = km.items.new('view3d.zoom', 'RIGHTMOUSE', 'PRESS', alt=True)
+kmi = km.items.new('view3d.view_selected', 'NUMPAD_PERIOD', 'PRESS')
+kmi = km.items.new('view3d.view_center_cursor', 'NUMPAD_PERIOD', 'PRESS', ctrl=True)
+kmi = km.items.new('view3d.fly', 'F', 'PRESS', shift=True)
+kmi = km.items.new('view3d.smoothview', 'TIMER1', 'ANY', any=True)
+kmi = km.items.new('view3d.rotate', 'TRACKPADPAN', 'ANY', alt=True)
+kmi = km.items.new('view3d.rotate', 'MOUSEROTATE', 'ANY')
+kmi = km.items.new('view3d.move', 'TRACKPADPAN', 'ANY')
+kmi = km.items.new('view3d.zoom', 'TRACKPADZOOM', 'ANY')
+kmi = km.items.new('view3d.zoom', 'NUMPAD_PLUS', 'PRESS')
 kmi.properties.delta = 1
-kmi = km.items.add('view3d.zoom', 'NUMPAD_MINUS', 'PRESS')
+kmi = km.items.new('view3d.zoom', 'NUMPAD_MINUS', 'PRESS')
 kmi.properties.delta = -1
-kmi = km.items.add('view3d.zoom', 'EQUAL', 'PRESS', ctrl=True)
+kmi = km.items.new('view3d.zoom', 'EQUAL', 'PRESS', ctrl=True)
 kmi.properties.delta = 1
-kmi = km.items.add('view3d.zoom', 'MINUS', 'PRESS', ctrl=True)
+kmi = km.items.new('view3d.zoom', 'MINUS', 'PRESS', ctrl=True)
 kmi.properties.delta = -1
-kmi = km.items.add('view3d.zoom', 'WHEELINMOUSE', 'PRESS')
+kmi = km.items.new('view3d.zoom', 'WHEELINMOUSE', 'PRESS')
 kmi.properties.delta = 1
-kmi = km.items.add('view3d.zoom', 'WHEELOUTMOUSE', 'PRESS')
+kmi = km.items.new('view3d.zoom', 'WHEELOUTMOUSE', 'PRESS')
 kmi.properties.delta = -1
-kmi = km.items.add('view3d.view_all', 'HOME', 'PRESS')
+kmi = km.items.new('view3d.view_all', 'HOME', 'PRESS')
 kmi.properties.center = False
-kmi = km.items.add('view3d.view_all', 'C', 'PRESS', shift=True)
+kmi = km.items.new('view3d.view_all', 'C', 'PRESS', shift=True)
 kmi.properties.center = True
-kmi = km.items.add('view3d.viewnumpad', 'NUMPAD_0', 'PRESS')
+kmi = km.items.new('view3d.viewnumpad', 'NUMPAD_0', 'PRESS')
 kmi.properties.type = 'CAMERA'
-kmi = km.items.add('view3d.viewnumpad', 'NUMPAD_1', 'PRESS')
+kmi = km.items.new('view3d.viewnumpad', 'NUMPAD_1', 'PRESS')
 kmi.properties.type = 'FRONT'
-kmi = km.items.add('view3d.view_orbit', 'NUMPAD_2', 'PRESS')
+kmi = km.items.new('view3d.view_orbit', 'NUMPAD_2', 'PRESS')
 kmi.properties.type = 'ORBITDOWN'
-kmi = km.items.add('view3d.viewnumpad', 'NUMPAD_3', 'PRESS')
+kmi = km.items.new('view3d.viewnumpad', 'NUMPAD_3', 'PRESS')
 kmi.properties.type = 'RIGHT'
-kmi = km.items.add('view3d.view_orbit', 'NUMPAD_4', 'PRESS')
+kmi = km.items.new('view3d.view_orbit', 'NUMPAD_4', 'PRESS')
 kmi.properties.type = 'ORBITLEFT'
-kmi = km.items.add('view3d.view_persportho', 'NUMPAD_5', 'PRESS')
-kmi = km.items.add('view3d.view_orbit', 'NUMPAD_6', 'PRESS')
+kmi = km.items.new('view3d.view_persportho', 'NUMPAD_5', 'PRESS')
+kmi = km.items.new('view3d.view_orbit', 'NUMPAD_6', 'PRESS')
 kmi.properties.type = 'ORBITRIGHT'
-kmi = km.items.add('view3d.viewnumpad', 'NUMPAD_7', 'PRESS')
+kmi = km.items.new('view3d.viewnumpad', 'NUMPAD_7', 'PRESS')
 kmi.properties.type = 'TOP'
-kmi = km.items.add('view3d.view_orbit', 'NUMPAD_8', 'PRESS')
+kmi = km.items.new('view3d.view_orbit', 'NUMPAD_8', 'PRESS')
 kmi.properties.type = 'ORBITUP'
-kmi = km.items.add('view3d.viewnumpad', 'NUMPAD_1', 'PRESS', ctrl=True)
+kmi = km.items.new('view3d.viewnumpad', 'NUMPAD_1', 'PRESS', ctrl=True)
 kmi.properties.type = 'BACK'
-kmi = km.items.add('view3d.viewnumpad', 'NUMPAD_3', 'PRESS', ctrl=True)
+kmi = km.items.new('view3d.viewnumpad', 'NUMPAD_3', 'PRESS', ctrl=True)
 kmi.properties.type = 'LEFT'
-kmi = km.items.add('view3d.viewnumpad', 'NUMPAD_7', 'PRESS', ctrl=True)
+kmi = km.items.new('view3d.viewnumpad', 'NUMPAD_7', 'PRESS', ctrl=True)
 kmi.properties.type = 'BOTTOM'
-kmi = km.items.add('view3d.view_pan', 'NUMPAD_2', 'PRESS', ctrl=True)
+kmi = km.items.new('view3d.view_pan', 'NUMPAD_2', 'PRESS', ctrl=True)
 kmi.properties.type = 'PANDOWN'
-kmi = km.items.add('view3d.view_pan', 'NUMPAD_4', 'PRESS', ctrl=True)
+kmi = km.items.new('view3d.view_pan', 'NUMPAD_4', 'PRESS', ctrl=True)
 kmi.properties.type = 'PANLEFT'
-kmi = km.items.add('view3d.view_pan', 'NUMPAD_6', 'PRESS', ctrl=True)
+kmi = km.items.new('view3d.view_pan', 'NUMPAD_6', 'PRESS', ctrl=True)
 kmi.properties.type = 'PANRIGHT'
-kmi = km.items.add('view3d.view_pan', 'NUMPAD_8', 'PRESS', ctrl=True)
+kmi = km.items.new('view3d.view_pan', 'NUMPAD_8', 'PRESS', ctrl=True)
 kmi.properties.type = 'PANUP'
-kmi = km.items.add('view3d.view_pan', 'WHEELUPMOUSE', 'PRESS', ctrl=True)
+kmi = km.items.new('view3d.view_pan', 'WHEELUPMOUSE', 'PRESS', ctrl=True)
 kmi.properties.type = 'PANRIGHT'
-kmi = km.items.add('view3d.view_pan', 'WHEELDOWNMOUSE', 'PRESS', ctrl=True)
+kmi = km.items.new('view3d.view_pan', 'WHEELDOWNMOUSE', 'PRESS', ctrl=True)
 kmi.properties.type = 'PANLEFT'
-kmi = km.items.add('view3d.view_pan', 'WHEELUPMOUSE', 'PRESS', shift=True)
+kmi = km.items.new('view3d.view_pan', 'WHEELUPMOUSE', 'PRESS', shift=True)
 kmi.properties.type = 'PANUP'
-kmi = km.items.add('view3d.view_pan', 'WHEELDOWNMOUSE', 'PRESS', shift=True)
+kmi = km.items.new('view3d.view_pan', 'WHEELDOWNMOUSE', 'PRESS', shift=True)
 kmi.properties.type = 'PANDOWN'
-kmi = km.items.add('view3d.view_orbit', 'WHEELUPMOUSE', 'PRESS', ctrl=True, alt=True)
+kmi = km.items.new('view3d.view_orbit', 'WHEELUPMOUSE', 'PRESS', ctrl=True, alt=True)
 kmi.properties.type = 'ORBITLEFT'
-kmi = km.items.add('view3d.view_orbit', 'WHEELDOWNMOUSE', 'PRESS', ctrl=True, alt=True)
+kmi = km.items.new('view3d.view_orbit', 'WHEELDOWNMOUSE', 'PRESS', ctrl=True, alt=True)
 kmi.properties.type = 'ORBITRIGHT'
-kmi = km.items.add('view3d.view_orbit', 'WHEELUPMOUSE', 'PRESS', shift=True, alt=True)
+kmi = km.items.new('view3d.view_orbit', 'WHEELUPMOUSE', 'PRESS', shift=True, alt=True)
 kmi.properties.type = 'ORBITUP'
-kmi = km.items.add('view3d.view_orbit', 'WHEELDOWNMOUSE', 'PRESS', shift=True, alt=True)
+kmi = km.items.new('view3d.view_orbit', 'WHEELDOWNMOUSE', 'PRESS', shift=True, alt=True)
 kmi.properties.type = 'ORBITDOWN'
-kmi = km.items.add('view3d.viewnumpad', 'NUMPAD_1', 'PRESS', shift=True)
+kmi = km.items.new('view3d.viewnumpad', 'NUMPAD_1', 'PRESS', shift=True)
 kmi.properties.align_active = True
 kmi.properties.type = 'FRONT'
-kmi = km.items.add('view3d.viewnumpad', 'NUMPAD_3', 'PRESS', shift=True)
+kmi = km.items.new('view3d.viewnumpad', 'NUMPAD_3', 'PRESS', shift=True)
 kmi.properties.align_active = True
 kmi.properties.type = 'RIGHT'
-kmi = km.items.add('view3d.viewnumpad', 'NUMPAD_7', 'PRESS', shift=True)
+kmi = km.items.new('view3d.viewnumpad', 'NUMPAD_7', 'PRESS', shift=True)
 kmi.properties.align_active = True
 kmi.properties.type = 'TOP'
-kmi = km.items.add('view3d.viewnumpad', 'NUMPAD_1', 'PRESS', shift=True, ctrl=True)
+kmi = km.items.new('view3d.viewnumpad', 'NUMPAD_1', 'PRESS', shift=True, ctrl=True)
 kmi.properties.align_active = True
 kmi.properties.type = 'BACK'
-kmi = km.items.add('view3d.viewnumpad', 'NUMPAD_3', 'PRESS', shift=True, ctrl=True)
+kmi = km.items.new('view3d.viewnumpad', 'NUMPAD_3', 'PRESS', shift=True, ctrl=True)
 kmi.properties.align_active = True
 kmi.properties.type = 'LEFT'
-kmi = km.items.add('view3d.viewnumpad', 'NUMPAD_7', 'PRESS', shift=True, ctrl=True)
+kmi = km.items.new('view3d.viewnumpad', 'NUMPAD_7', 'PRESS', shift=True, ctrl=True)
 kmi.properties.align_active = True
 kmi.properties.type = 'BOTTOM'
-kmi = km.items.add('view3d.localview', 'NUMPAD_SLASH', 'PRESS')
-kmi = km.items.add('view3d.layers', 'ACCENT_GRAVE', 'PRESS')
+kmi = km.items.new('view3d.localview', 'NUMPAD_SLASH', 'PRESS')
+kmi = km.items.new('view3d.layers', 'ACCENT_GRAVE', 'PRESS')
 kmi.properties.nr = 0
-kmi = km.items.add('view3d.layers', 'ONE', 'PRESS', any=True)
+kmi = km.items.new('view3d.layers', 'ONE', 'PRESS', any=True)
 kmi.properties.nr = 1
-kmi = km.items.add('view3d.layers', 'TWO', 'PRESS', any=True)

@@ Diff output truncated at 10240 characters. @@




More information about the Bf-blender-cvs mailing list