diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2018-03-19 20:06:27 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2018-03-19 20:14:05 +0300 |
| commit | 5e81d993afadc6b5d37410e91998395caf1d1281 (patch) | |
| tree | ec57394bb9e74110a21b086678535e17c65524db /source/blender/editors/space_api | |
| parent | b5bf3011bf3851d1e68dbcdde310fff04dc3f2f5 (diff) | |
| parent | a3486e735f7e5af6ca78dafc8608cced5a121096 (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/editors/space_api')
| -rw-r--r-- | source/blender/editors/space_api/spacetypes.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/source/blender/editors/space_api/spacetypes.c b/source/blender/editors/space_api/spacetypes.c index e417026640e..4455b117370 100644 --- a/source/blender/editors/space_api/spacetypes.c +++ b/source/blender/editors/space_api/spacetypes.c @@ -61,6 +61,7 @@ #include "ED_space_api.h" #include "ED_sound.h" #include "ED_uvedit.h" +#include "ED_lattice.h" #include "ED_mball.h" #include "ED_logic.h" #include "ED_clip.h" @@ -108,6 +109,7 @@ void ED_spacetypes_init(void) ED_operatortypes_animchannels(); ED_operatortypes_gpencil(); ED_operatortypes_object(); + ED_operatortypes_lattice(); ED_operatortypes_mesh(); ED_operatortypes_sculpt(); ED_operatortypes_uvedit(); @@ -195,7 +197,8 @@ void ED_spacetypes_keymap(wmKeyConfig *keyconf) ED_keymap_anim(keyconf); ED_keymap_animchannels(keyconf); ED_keymap_gpencil(keyconf); - ED_keymap_object(keyconf); /* defines lattice also */ + ED_keymap_object(keyconf); + ED_keymap_lattice(keyconf); ED_keymap_mesh(keyconf); ED_keymap_uvedit(keyconf); ED_keymap_curve(keyconf); |