Merge branch 'blender2.7'
authorBrecht Van Lommel <brechtvanlommel@gmail.com>
Tue, 5 Mar 2019 18:14:00 +0000 (19:14 +0100)
committerBrecht Van Lommel <brechtvanlommel@gmail.com>
Tue, 5 Mar 2019 18:14:00 +0000 (19:14 +0100)
1  2 
intern/cycles/blender/blender_mesh.cpp
intern/cycles/render/nodes.cpp

Simple merge