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)
1  2 
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

Simple merge