Merge branch 'blender2.7'
authorLukas Stockner <lukas.stockner@freenet.de>
Fri, 18 Jan 2019 00:47:32 +0000 (01:47 +0100)
committerLukas Stockner <lukas.stockner@freenet.de>
Fri, 18 Jan 2019 00:47:32 +0000 (01:47 +0100)
commit031a9d6424815ce73897e25800356c9888b1cde2
treea6c194a7fc58e412f434673363eb0fa6892e31af
parent2757469824bbe98d943b42f57ff23782b97a3abf
parentc9eef24903479a70783efb2e00766d0eeec43823
Merge branch 'blender2.7'
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