Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Wed, 3 Jan 2018 13:09:10 +0000 (00:09 +1100)
committerCampbell Barton <ideasman42@gmail.com>
Wed, 3 Jan 2018 13:09:10 +0000 (00:09 +1100)
commitf20bb6c63f40a3944ceaf976d5c8aa6613477132
treeca98f0e90fdc11c233df314bdec844b5f419d820
parentbe403891652a375e5a0ac61b493342ca6d39afb7
parentffb2c40176e4ff5026dc493c969af58b23d7f212
Merge branch 'master' into blender2.8
release/scripts/startup/bl_ui/properties_object.py
source/blender/editors/include/UI_interface.h
source/blender/editors/interface/interface_templates.c
source/blender/editors/space_clip/clip_buttons.c
source/blender/editors/space_logic/logic_window.c
source/blender/editors/space_node/drawnode.c
source/blender/makesrna/intern/rna_ui_api.c
source/blender/windowmanager/WM_api.h
source/blender/windowmanager/intern/wm_event_system.c
source/blenderplayer/bad_level_call_stubs/stubs.c