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)
commitf60896454929080ae775a7143c30722788ab83df
tree33accd750fb55f00b33730c5bb601254799fd369
parent403ae48063d91126bd36ca56920290bcb53f504e
parent2c8bd1d8cb6dc0f1a182d77c6b8283b25a01f1eb
Merge branch 'blender2.7'
intern/cycles/render/buffers.cpp
source/blender/editors/object/object_bake_api.c