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)
commit21b361194fb4465ddb9590d1c784820b926bebe7
treedbce9a151032620b2c6a3a7e48e8eda796bea020
parenta6d4ac28f56b5470ae7492a1cea7e3967e1fb836
parent6b86b446d3b8a2ab40bed8fc7b5aacd583584d52
Merge branch 'master' into blender2.8
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