Merge branch 'master' into blender2.8
authorBastien Montagne <montagne29@wanadoo.fr>
Tue, 8 May 2018 14:06:32 +0000 (16:06 +0200)
committerBastien Montagne <montagne29@wanadoo.fr>
Tue, 8 May 2018 14:06:32 +0000 (16:06 +0200)
commit43be4343107b1dc2a05353a6ff41360cce27d629
treead47af6e9e207dab52df58c269086c100b613f77
parenta48186c5d74b3d353c5c65cd4a930dd98cc9a603
parent4e4a93bc454d93ec8523f44b73a42977e2868ecc
Merge branch 'master' into blender2.8

Conflicts:
source/blender/modifiers/intern/MOD_dynamicpaint.c
source/blender/modifiers/intern/MOD_uvproject.c
source/blender/blenkernel/intern/writeffmpeg.c
source/blender/modifiers/intern/MOD_dynamicpaint.c
source/blender/modifiers/intern/MOD_meshsequencecache.c
source/blender/modifiers/intern/MOD_uvproject.c