Merge branch 'blender2.7'
authorBrecht Van Lommel <brechtvanlommel@gmail.com>
Mon, 11 Mar 2019 13:34:17 +0000 (14:34 +0100)
committerBrecht Van Lommel <brechtvanlommel@gmail.com>
Mon, 11 Mar 2019 13:34:17 +0000 (14:34 +0100)
1  2 
intern/cycles/render/buffers.cpp
source/blender/editors/object/object_bake_api.c

Simple merge