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)
commit8986c92b651ddf7ec6b5b71f70a92a3d08b250b5
tree0324dba633dd689d38927fa6c0f40cd9c7723cbb
parentd518438479fea395970ddf7395d71452cbe1e57b
parent1d38a83139582ff37adc0757bd39d87d5932ddf5
Merge branch 'blender2.7'
source/blender/blenkernel/intern/seqeffects.c
source/blender/render/intern/source/pipeline.c