Merge branch 'master' into blender2.8
authorGermano <germano.costa@ig.com.br>
Thu, 3 May 2018 18:54:26 +0000 (15:54 -0300)
committerGermano <germano.costa@ig.com.br>
Thu, 3 May 2018 18:54:26 +0000 (15:54 -0300)
1  2 
source/blender/blenkernel/intern/dynamicpaint.c
source/blender/editors/physics/particle_edit.c