Merge branch 'blender2.7'
authorBrecht Van Lommel <brechtvanlommel@gmail.com>
Mon, 18 Mar 2019 18:06:21 +0000 (19:06 +0100)
committerBrecht Van Lommel <brechtvanlommel@gmail.com>
Mon, 18 Mar 2019 18:06:21 +0000 (19:06 +0100)
commita29186efb414cec130dbfe4f81173b64d37ad10a
treecb7b98c42f938050a87ddb141f8f3e1197a25f9c
parentb29790a953ff0f31c431daaaa2864e48bd38e94c
parent01df4818a6e1d3b93517e48a617310481abd9339
Merge branch 'blender2.7'
intern/cycles/blender/blender_curves.cpp
intern/cycles/render/light.cpp
intern/cycles/render/light.h