Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Thu, 28 Jun 2018 21:57:00 +0000 (23:57 +0200)
committerCampbell Barton <ideasman42@gmail.com>
Thu, 28 Jun 2018 21:57:00 +0000 (23:57 +0200)
commit4d39da1060105210a665e083b8d035f18b989a9f
treea70a598caf927a7c1131fb88d504a61b20f02335
parent4d1c5f1ec51e7978c76271730d479e0aef15c63a
parent46dceefc353ab8c84731c9f8f09a34733e004d1b
Merge branch 'master' into blender2.8
19 files changed:
release/scripts/modules/bl_i18n_utils/utils_spell_check.py
release/scripts/presets/keyconfig/3dsmax.py
release/scripts/presets/keyconfig/maya.py
release/scripts/startup/bl_ui/space_topbar.py
release/scripts/startup/bl_ui/space_userpref.py
source/blender/editors/interface/interface_templates.c
source/blender/editors/interface/resources.c
source/blender/editors/screen/screen_intern.h
source/blender/editors/screen/screen_ops.c
source/blender/editors/screen/screendump.c
source/blender/editors/space_info/space_info.c
source/blender/editors/space_node/space_node.c
source/blender/editors/space_sequencer/space_sequencer.c
source/blender/editors/space_statusbar/space_statusbar.c
source/blender/makesdna/DNA_userdef_types.h
source/blender/makesrna/intern/rna_userdef.c
source/blender/windowmanager/WM_api.h
source/blender/windowmanager/WM_types.h
source/blender/windowmanager/intern/wm_window.c