Merge branch 'master' into blender2.8
authorSybren A. Stüvel <sybren@stuvel.eu>
Mon, 9 Apr 2018 13:44:28 +0000 (15:44 +0200)
committerSybren A. Stüvel <sybren@stuvel.eu>
Mon, 9 Apr 2018 13:44:28 +0000 (15:44 +0200)
1  2 
release/scripts/startup/bl_ui/properties_render.py
source/blender/blenkernel/intern/writeffmpeg.c
source/blender/blenloader/intern/versioning_270.c
source/blender/makesdna/DNA_scene_types.h
source/blender/makesrna/intern/rna_scene.c