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)
commitb880c13c3aa9e0d00509586224a0b30586ebb594
tree3f63af5ab8fb50adc042df2971556cf96951eb5c
parenta33034cc3fd17802ffdd3e87e9958f5539f67bbb
parentb030277e791e429e8f8de90316144830eda6bbf8
Merge branch 'master' into blender2.8
source/blender/blenkernel/intern/writeffmpeg.c
source/blender/makesdna/DNA_scene_types.h
source/blender/makesrna/intern/rna_scene.c