Merge branch 'blender2.7'
authorStefan Werner <stefan.werner@tangent-animation.com>
Tue, 5 Mar 2019 14:06:09 +0000 (15:06 +0100)
committerStefan Werner <stefan.werner@tangent-animation.com>
Tue, 5 Mar 2019 14:06:09 +0000 (15:06 +0100)
commitc891fb2fbe99362ac8f3ff0821b32b84566f8f1c
treee410c45d5413058780cc6ae6b1a5033c80386c22
parentcb7e66737d2d2d0628dda49ddb7d5541915d017b
parentdb7f9a70b0addd17a2f8a8d87c0b4d77d78b536e
Merge branch 'blender2.7'
intern/cycles/blender/blender_mesh.cpp
intern/cycles/render/mesh.cpp
intern/cycles/render/nodes.cpp
intern/cycles/render/scene.cpp
intern/cycles/render/scene.h