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)
1  2 
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

Simple merge