diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2018-02-23 05:10:39 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2018-02-23 05:10:39 +0300 |
| commit | 171c756f2006cf0e839fc9fcdd6b0cadebfe699a (patch) | |
| tree | 39293150b38ff752b210e342e327902ff9dec2df /source/blender/makesdna/DNA_windowmanager_types.h | |
| parent | d7ba1ada8208f6f846b3705f5c6d9933261a625f (diff) | |
| parent | f36c803e55983ad30b032da2a775752eb4491fdc (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/makesdna/DNA_windowmanager_types.h')
| -rw-r--r-- | source/blender/makesdna/DNA_windowmanager_types.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/source/blender/makesdna/DNA_windowmanager_types.h b/source/blender/makesdna/DNA_windowmanager_types.h index 9e1d5e4ec93..56c3c8ab976 100644 --- a/source/blender/makesdna/DNA_windowmanager_types.h +++ b/source/blender/makesdna/DNA_windowmanager_types.h @@ -317,8 +317,10 @@ typedef struct wmKeyMap { short kmi_id; /* last kmi id */ /* runtime */ - int (*poll)(struct bContext *); /* verify if enabled in the current context */ - const void *modal_items; /* for modal, EnumPropertyItem for now */ + /** Verify if enabled in the current context, use #WM_keymap_poll instead of direct calls. */ + int (*poll)(struct bContext *); + /** For modal, #EnumPropertyItem for now. */ + const void *modal_items; } wmKeyMap; /* wmKeyMap.flag */ |