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)
commitc1a2f973daafa403664353526b8cf3c59cccf24c
treeca37df851280c88ba533ada38085c875ee049099
parentd533b70b234d6a6cb7a44a556fcbf3fc68f67085
parent7e39d151d850590fbabc9870bc5134d9421c5c2c
Merge branch 'master' into blender2.8
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