Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Wed, 29 Mar 2017 09:20:53 +0000 (20:20 +1100)
committerCampbell Barton <ideasman42@gmail.com>
Wed, 29 Mar 2017 09:20:53 +0000 (20:20 +1100)
commit2be098a1a02da30617516d32e6cd1409644c005e
treecdb437a3da41d0b9a28b49dc8a517f0f7cb5c597
parentff3e1fa7609f3371b8a93251ab7b7c53a2227382
parentc2d3bb709044b7a2730b9fb5005657f38eaff6f2
Merge branch 'master' into blender2.8
intern/cycles/blender/addon/ui.py
release/scripts/startup/bl_ui/__init__.py
source/blender/editors/object/object_modifier.c
source/blender/windowmanager/intern/wm_files.c
source/blender/windowmanager/intern/wm_init_exit.c
source/blender/windowmanager/intern/wm_window.c