Merge branch 'blender2.8' into userpref_redesign
authorJulian Eisel <eiseljulian@gmail.com>
Thu, 22 Nov 2018 18:06:52 +0000 (19:06 +0100)
committerJulian Eisel <eiseljulian@gmail.com>
Thu, 22 Nov 2018 18:06:52 +0000 (19:06 +0100)
commit6a7e974a936c2cc363c519b0bf0d97d1f32e825c
tree83e84cb0d01215ce2825459b01d14bb1e00667d3
parent3f5f4f089dd4b05a65c10d5b224cb7ebabe32f11
parente815784aa684ccd66a491bbf27370b91ce14f397
Merge branch 'blender2.8' into userpref_redesign
17 files changed:
release/scripts/addons
release/scripts/addons_contrib
release/scripts/startup/bl_ui/space_info.py
release/scripts/startup/bl_ui/space_topbar.py
release/scripts/startup/bl_ui/space_userpref.py
source/blender/blenkernel/BKE_screen.h
source/blender/blenkernel/intern/screen.c
source/blender/blenloader/intern/versioning_280.c
source/blender/editors/include/UI_interface.h
source/blender/editors/interface/interface_layout.c
source/blender/editors/screen/screen_ops.c
source/blender/editors/space_userpref/space_userpref.c
source/blender/makesdna/DNA_userdef_types.h
source/blender/makesrna/intern/rna_userdef.c
source/blender/windowmanager/WM_api.h
source/blender/windowmanager/intern/wm_window.c
source/tools