Merge branch 'blender2.7'
authorSergey Sharybin <sergey.vfx@gmail.com>
Mon, 18 Mar 2019 11:03:22 +0000 (12:03 +0100)
committerSergey Sharybin <sergey.vfx@gmail.com>
Mon, 18 Mar 2019 11:03:22 +0000 (12:03 +0100)
1  2 
intern/cycles/render/light.cpp

Simple merge