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)
1  2 
intern/cycles/blender/blender_python.cpp
intern/cycles/render/light.cpp

Simple merge