Merge branch 'master' into blender2.8
authorSybren A. Stüvel <sybren@stuvel.eu>
Tue, 15 Aug 2017 11:02:45 +0000 (13:02 +0200)
committerSybren A. Stüvel <sybren@stuvel.eu>
Tue, 15 Aug 2017 11:02:45 +0000 (13:02 +0200)
commit3bca9f5fed1f6d3dd485e3cff2174c3394bb1162
tree7083a56f6b8db22ad51a6319f7281cb4d7124c12
parent3311505fd07310a6bfac79ce787dbd394002dd1f
parentf20d7bed1426ca3d1268182835f04e7ab8212cac
Merge branch 'master' into blender2.8

# Conflicts:
# source/blender/makesrna/intern/rna_render.c
intern/cycles/blender/addon/ui.py
intern/cycles/blender/blender_sync.cpp
release/scripts/startup/bl_ui/properties_render.py
source/blender/alembic/intern/abc_mesh.cc
source/blender/blenkernel/BKE_scene.h
source/blender/blenkernel/intern/scene.c
source/blender/editors/render/render_internal.c
source/blender/makesdna/DNA_scene_types.h
source/blender/makesrna/intern/rna_render.c
source/blender/makesrna/intern/rna_scene.c