Blender Git Loki
Git Commits -> Revision 034dd0d
March 7, 2021, 12:40 (GMT) |
XR: Move actions from keymaps to actionmaps Previously, properties for XR actions were stored in keymaps but they are now stored in a separate XR "actionmaps" system. Although the actionmap system/API has many similarities to the keymaps, it is significantly less complex since it does not involve any diff-ing of default/addon/user configurations (at least at the moment). Another big distinction between keymaps and actionmaps is that actionmaps and properties are saved to blend files. This allows users to set up a VR scene with actions and properties and share working versions with others, without the need to import/export config files. However, actionmap import/export is also supported via the addon. There is still a fair amount of refactoring left to do but at least this commit removes XR involvement from the keymaps while preserving most of the existing XR action functionality (i.e. default actions and user-configurable actions). |
Commit Details:
Full Hash: 034dd0d702a49bbe156e363f521d5b434407d20f
Parent Commit: d8cf5e7
Lines Changed: +1363, -295
1 Added Path:
/source/blender/windowmanager/xr/intern/wm_xr_actionmap.c (+514, -0) (View)
26 Modified Paths:
/release/scripts/modules/bl_keymap_utils/io.py (+36, -52) (Diff)
/release/scripts/modules/bl_keymap_utils/keymap_hierarchy.py (+0, -4) (Diff)
/release/scripts/modules/rna_keymap_ui.py (+1, -7) (Diff)
/release/scripts/presets/keyconfig/keymap_data/blender_default.py (+0, -24) (Diff)
/source/blender/editors/include/UI_interface.h (+1, -0) (Diff)
/source/blender/editors/interface/CMakeLists.txt (+3, -0) (Diff)
/source/blender/editors/interface/interface_templates.c (+36, -0) (Diff)
/source/blender/makesdna/DNA_windowmanager_types.h (+0, -1) (Diff)
/source/blender/makesdna/DNA_xr_types.h (+120, -2) (Diff)
/source/blender/makesrna/intern/rna_internal.h (+3, -0) (Diff)
/source/blender/makesrna/intern/rna_ui_api.c (+5, -0) (Diff)
/source/blender/makesrna/intern/rna_wm.c (+2, -75) (Diff)
/source/blender/makesrna/intern/rna_wm_api.c (+0, -21) (Diff)
/source/blender/makesrna/intern/rna_xr.c (+531, -33) (Diff)
/source/blender/windowmanager/CMakeLists.txt (+1, -0) (Diff)
/source/blender/windowmanager/intern/wm.c (+52, -0) (Diff)
/source/blender/windowmanager/intern/wm_event_system.c (+0, -8) (Diff)
/source/blender/windowmanager/intern/wm_files.c (+10, -0) (Diff)
/source/blender/windowmanager/intern/wm_keymap.c (+1, -31) (Diff)
/source/blender/windowmanager/WM_api.h (+34, -8) (Diff)
/source/blender/windowmanager/wm_event_types.h (+0, -3) (Diff)
/source/blender/windowmanager/WM_keymap.h (+0, -3) (Diff)
/source/blender/windowmanager/WM_types.h (+2, -16) (Diff)
/source/blender/windowmanager/xr/intern/wm_xr_actions.c (+5, -5) (Diff)
/source/blender/windowmanager/xr/intern/wm_xr_intern.h (+3, -2) (Diff)
/source/creator/creator.c (+3, -0) (Diff)
/release/scripts/modules/bl_keymap_utils/keymap_hierarchy.py (+0, -4) (Diff)
/release/scripts/modules/rna_keymap_ui.py (+1, -7) (Diff)
/release/scripts/presets/keyconfig/keymap_data/blender_default.py (+0, -24) (Diff)
/source/blender/editors/include/UI_interface.h (+1, -0) (Diff)
/source/blender/editors/interface/CMakeLists.txt (+3, -0) (Diff)
/source/blender/editors/interface/interface_templates.c (+36, -0) (Diff)
/source/blender/makesdna/DNA_windowmanager_types.h (+0, -1) (Diff)
/source/blender/makesdna/DNA_xr_types.h (+120, -2) (Diff)
/source/blender/makesrna/intern/rna_internal.h (+3, -0) (Diff)
/source/blender/makesrna/intern/rna_ui_api.c (+5, -0) (Diff)
/source/blender/makesrna/intern/rna_wm.c (+2, -75) (Diff)
/source/blender/makesrna/intern/rna_wm_api.c (+0, -21) (Diff)
/source/blender/makesrna/intern/rna_xr.c (+531, -33) (Diff)
/source/blender/windowmanager/CMakeLists.txt (+1, -0) (Diff)
/source/blender/windowmanager/intern/wm.c (+52, -0) (Diff)
/source/blender/windowmanager/intern/wm_event_system.c (+0, -8) (Diff)
/source/blender/windowmanager/intern/wm_files.c (+10, -0) (Diff)
/source/blender/windowmanager/intern/wm_keymap.c (+1, -31) (Diff)
/source/blender/windowmanager/WM_api.h (+34, -8) (Diff)
/source/blender/windowmanager/wm_event_types.h (+0, -3) (Diff)
/source/blender/windowmanager/WM_keymap.h (+0, -3) (Diff)
/source/blender/windowmanager/WM_types.h (+2, -16) (Diff)
/source/blender/windowmanager/xr/intern/wm_xr_actions.c (+5, -5) (Diff)
/source/blender/windowmanager/xr/intern/wm_xr_intern.h (+3, -2) (Diff)
/source/creator/creator.c (+3, -0) (Diff)