diff options
author | Campbell Barton <ideasman42@gmail.com> | 2018-08-31 06:40:10 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2018-08-31 06:40:10 +0300 |
commit | 7c6136b35ca18da5a36b6030ade3b45dc5cb483d (patch) | |
tree | ccbb462c30e9c1f7419ff255e2ddfee7bbc81b91 /source/blender/editors/physics/physics_ops.c | |
parent | e3c110e72e9d7a893d1681eeb84287032fc53d17 (diff) | |
parent | 18d135d05c53885eb7460e1c95cc8ebbdb771102 (diff) |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/editors/physics/physics_ops.c')
-rw-r--r-- | source/blender/editors/physics/physics_ops.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/editors/physics/physics_ops.c b/source/blender/editors/physics/physics_ops.c index a41033bf47d..c95e7bb3e15 100644 --- a/source/blender/editors/physics/physics_ops.c +++ b/source/blender/editors/physics/physics_ops.c @@ -114,7 +114,7 @@ static void keymap_particle(wmKeyConfig *keyconf) wmKeyMapItem *kmi; wmKeyMap *keymap; - keymap = WM_keymap_find(keyconf, "Particle", 0, 0); + keymap = WM_keymap_ensure(keyconf, "Particle", 0, 0); keymap->poll = PE_poll; kmi = WM_keymap_add_item(keymap, "PARTICLE_OT_select_all", AKEY, KM_PRESS, 0, 0); @@ -208,7 +208,7 @@ static void operatortypes_dynamicpaint(void) //static void keymap_pointcache(wmWindowManager *wm) //{ -// wmKeyMap *keymap = WM_keymap_find(wm, "Pointcache", 0, 0); +// wmKeyMap *keymap = WM_keymap_ensure(wm, "Pointcache", 0, 0); // // WM_keymap_add_item(keymap, "PHYSICS_OT_bake_all", AKEY, KM_PRESS, 0, 0); // WM_keymap_add_item(keymap, "PHYSICS_OT_free_all", PADPLUSKEY, KM_PRESS, KM_CTRL, 0); |