Merge branch 'master' into blender2.8
authorSergey Sharybin <sergey.vfx@gmail.com>
Fri, 7 Dec 2018 14:00:48 +0000 (15:00 +0100)
committerSergey Sharybin <sergey.vfx@gmail.com>
Fri, 7 Dec 2018 14:00:48 +0000 (15:00 +0100)
commit4fe578c827afacdd67f9f8064b2cd831af29e6a2
treea7f807f661a89c440583d3edff11e13caa36cd0d
parente7c3f7ba6f1385a2138862de8568e571fa97b5b4
parent3b1f90ed84c52260ce94a26c414ad8c51f6a1365
Merge branch 'master' into blender2.8
intern/cycles/blender/addon/properties.py