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)
commit3428ec5984c0b7bac37fa860c660652f822919a9
treec0ca0f2ee4781f823cb658fca1bfbdb9614b010d
parent5e8e3c00f2aa8331148c59db40a9ee43ee55438e
parente290a0b0568ecfcf47aa55b059de468b2c651e19
Merge branch 'blender2.7'
intern/cycles/blender/blender_mesh.cpp
intern/cycles/render/nodes.cpp