Merge branch 'master' into blender2.8
authorSergey Sharybin <sergey.vfx@gmail.com>
Fri, 28 Sep 2018 11:58:30 +0000 (13:58 +0200)
committerSergey Sharybin <sergey.vfx@gmail.com>
Fri, 28 Sep 2018 11:58:30 +0000 (13:58 +0200)
1  2 
source/blender/blenkernel/intern/writeffmpeg.c
source/blender/makesdna/DNA_scene_types.h
source/blender/makesrna/intern/rna_scene.c