Merge branch 'blender2.7'
authorBrecht Van Lommel <brechtvanlommel@gmail.com>
Fri, 1 Mar 2019 18:29:26 +0000 (19:29 +0100)
committerBrecht Van Lommel <brechtvanlommel@gmail.com>
Fri, 1 Mar 2019 18:29:26 +0000 (19:29 +0100)
commita577499c7521c5fcfaefd58ec1d8940886563adc
tree99282a1d920bd693933efeac4d69a6807bd0e974
parentd16386e50bc104f9446a30e041a7b74f38b51ae9
parent4c3be0bf52292add5cdf23be5f4affb76f1b747d
Merge branch 'blender2.7'
build_files/cmake/platform/platform_apple.cmake
source/blender/nodes/composite/nodes/node_composite_image.c
source/blender/render/extern/include/RE_engine.h
source/blender/render/intern/include/render_result.h
source/blender/render/intern/source/external_engine.c
source/blender/render/intern/source/render_result.c