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)
commitff3e1fa7609f3371b8a93251ab7b7c53a2227382
treeecb8153deca49034aea7e9e4fe280c25de0b5565
parent855b56b90c7edf651684d84acccb168e70b355e2
parent93426cb295c53f1af01451c6f6fad29afe05bb5e
Merge branch 'master' into blender2.8
intern/cycles/blender/addon/ui.py
source/blender/blenloader/intern/readfile.c
source/blender/editors/interface/interface_widgets.c