Merge branch 'blender2.7'
authorBrecht Van Lommel <brechtvanlommel@gmail.com>
Mon, 25 Feb 2019 18:55:49 +0000 (19:55 +0100)
committerBrecht Van Lommel <brechtvanlommel@gmail.com>
Mon, 25 Feb 2019 18:55:49 +0000 (19:55 +0100)
commit98c90df56c1b53109e0fe490fd97bb5031766be6
tree7ea939e368cae8ee44e7d4af53606fc5ba1016bd
parent753e73009f7886d61aa80ae0ec56e87dd203bfe7
parent7e40a231a7c55a6745511221a74137317bd0aaec
Merge branch 'blender2.7'
source/blender/blenkernel/BKE_image.h
source/blender/blenkernel/intern/image.c
source/blender/render/intern/source/pipeline.c
source/blender/render/intern/source/render_result.c