Merge branch 'master' into blender2.8
authorAntonio Vazquez <blendergit@gmail.com>
Mon, 28 May 2018 13:25:41 +0000 (15:25 +0200)
committerAntonio Vazquez <blendergit@gmail.com>
Mon, 28 May 2018 13:25:41 +0000 (15:25 +0200)
commite673be1ebc83b1c156eb608935dace95437eccba
tree1737cc02db725997b34ca7c4601f5c89002849c8
parent95c5d1193f12375cd7423be9bde1606cd0a05809
parentdc0eed178a0f71634399a61b929a544e554ef6aa
Merge branch 'master' into blender2.8
intern/cycles/blender/blender_python.cpp
intern/cycles/render/light.cpp