Merge branch 'master' into blender2.8
authorBastien Montagne <montagne29@wanadoo.fr>
Mon, 20 Mar 2017 13:37:44 +0000 (14:37 +0100)
committerBastien Montagne <montagne29@wanadoo.fr>
Mon, 20 Mar 2017 13:37:44 +0000 (14:37 +0100)
1  2 
intern/cycles/blender/addon/ui.py
release/scripts/startup/bl_ui/space_view3d.py
source/blender/editors/space_view3d/drawarmature.c
source/blender/windowmanager/intern/wm_files.c

Simple merge