Merge branch 'master' into blender2.8
authorBastien Montagne <montagne29@wanadoo.fr>
Tue, 31 Oct 2017 16:38:53 +0000 (17:38 +0100)
committerBastien Montagne <montagne29@wanadoo.fr>
Tue, 31 Oct 2017 16:38:53 +0000 (17:38 +0100)
commitc8de666cbe95403b4e902f10007ef94ec1808c04
treef15008e697c946a6488087109dbe3c524ebeabbe
parent3a72f02d800006d77a6f3ba9597f059c77ce6553
parent4e33d07565a4bc1c6702d0e4edf5c04392f7d5a6
Merge branch 'master' into blender2.8
intern/cycles/blender/blender_session.cpp
source/blender/blenkernel/intern/image.c
source/blender/makesrna/intern/rna_render.c
source/blender/render/extern/include/RE_engine.h
source/blender/render/intern/source/external_engine.c
source/blenderplayer/bad_level_call_stubs/stubs.c