Merge branch 'master' into blender2.8
authorBastien Montagne <montagne29@wanadoo.fr>
Sun, 9 Dec 2018 20:51:23 +0000 (21:51 +0100)
committerBastien Montagne <montagne29@wanadoo.fr>
Sun, 9 Dec 2018 20:51:23 +0000 (21:51 +0100)
commit168a6a4bfc13cbe5c2fb510607b9565de3eb9472
tree1614102a8c5355c6e37020840b4492f6857990c7
parent879877295d0785aef0b47ebc031a06dd2f17a63f
parentd7ef1af22bf48f00607ba86e1344e1467e6e5e53
Merge branch 'master' into blender2.8

Conflicts:
source/blender/makesrna/intern/rna_dynamicpaint.c
source/blender/makesrna/intern/rna_dynamicpaint.c