Merge branch 'master' into blender2.8
authorLukas Stockner <lukas.stockner@freenet.de>
Wed, 3 May 2017 16:33:02 +0000 (18:33 +0200)
committerLukas Stockner <lukas.stockner@freenet.de>
Wed, 3 May 2017 16:33:02 +0000 (18:33 +0200)
commit82e242cc7287ce56d10f88a76de5418a7b20e239
treec513d6537cfd3d3a1b3d098a8a4f45c55611f165
parent2564d929fc5f75403bc5ca051fb33bc7b8874646
parent15189baa5231d70c1363192eb01b83fa946f36f0
Merge branch 'master' into blender2.8
32 files changed:
intern/cycles/blender/addon/__init__.py
intern/cycles/blender/addon/engine.py
intern/cycles/blender/addon/ui.py
intern/cycles/blender/blender_python.cpp
intern/cycles/blender/blender_session.cpp
intern/cycles/blender/blender_sync.cpp
intern/cycles/blender/blender_sync.h
source/blender/blenkernel/BKE_node.h
source/blender/blenkernel/intern/scene.c
source/blender/blenloader/intern/readfile.c
source/blender/blenloader/intern/versioning_270.c
source/blender/blenloader/intern/writefile.c
source/blender/draw/engines/basic/basic_engine.c
source/blender/draw/engines/clay/clay_engine.c
source/blender/draw/engines/eevee/eevee_engine.c
source/blender/draw/engines/external/external_engine.c
source/blender/editors/render/render_internal.c
source/blender/editors/render/render_update.c
source/blender/editors/space_node/drawnode.c
source/blender/editors/space_node/node_edit.c
source/blender/makesdna/DNA_scene_types.h
source/blender/makesrna/intern/CMakeLists.txt
source/blender/makesrna/intern/rna_render.c
source/blender/makesrna/intern/rna_scene.c
source/blender/nodes/CMakeLists.txt
source/blender/render/CMakeLists.txt
source/blender/render/extern/include/RE_engine.h
source/blender/render/extern/include/RE_pipeline.h
source/blender/render/intern/source/envmap.c
source/blender/render/intern/source/external_engine.c
source/blender/render/intern/source/pipeline.c
source/blenderplayer/bad_level_call_stubs/stubs.c