Merge branch 'master' into blender2.8
authorJulian Eisel <eiseljulian@gmail.com>
Tue, 28 Mar 2017 21:11:10 +0000 (23:11 +0200)
committerJulian Eisel <eiseljulian@gmail.com>
Tue, 28 Mar 2017 21:11:10 +0000 (23:11 +0200)
1  2 
intern/cycles/blender/addon/ui.py
source/blender/blenloader/intern/readfile.c
source/blender/editors/interface/interface_widgets.c

Simple merge