Merge branch 'blender2.7'
authorSergey Sharybin <sergey.vfx@gmail.com>
Thu, 21 Feb 2019 14:33:07 +0000 (15:33 +0100)
committerSergey Sharybin <sergey.vfx@gmail.com>
Thu, 21 Feb 2019 14:33:07 +0000 (15:33 +0100)
1  2 
source/blender/blenkernel/intern/seqeffects.c
source/blender/render/intern/source/pipeline.c