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)
commit32c620b0d68925fe21487df826f1b20a56d5b8a0
tree833c6f5e97373fd6a1584076a4f9906e21b90577
parent5760c6b25cc4e014868ff67f2c357ea38e40eafa
parent7915cc7ddbc221385e824f737ff7e48e5f52a1dd
Merge branch 'master' into blender2.8
source/blender/blenkernel/intern/dynamicpaint.c
source/blender/editors/physics/particle_edit.c