diff options
| author | Germano <germano.costa@ig.com.br> | 2018-05-03 21:54:26 +0300 |
|---|---|---|
| committer | Germano <germano.costa@ig.com.br> | 2018-05-03 21:54:26 +0300 |
| commit | 32c620b0d68925fe21487df826f1b20a56d5b8a0 (patch) | |
| tree | 833c6f5e97373fd6a1584076a4f9906e21b90577 /source/blender/blenkernel | |
| parent | 5760c6b25cc4e014868ff67f2c357ea38e40eafa (diff) | |
| parent | 7915cc7ddbc221385e824f737ff7e48e5f52a1dd (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/blenkernel')
| -rw-r--r-- | source/blender/blenkernel/intern/dynamicpaint.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/blenkernel/intern/dynamicpaint.c b/source/blender/blenkernel/intern/dynamicpaint.c index 187edd5b4a5..c91d3b32e75 100644 --- a/source/blender/blenkernel/intern/dynamicpaint.c +++ b/source/blender/blenkernel/intern/dynamicpaint.c @@ -4164,7 +4164,7 @@ static int dynamicPaint_paintMesh(struct Depsgraph *depsgraph, DynamicPaintSurfa /* check bounding box collision */ if (grid && meshBrush_boundsIntersect(&grid->grid_bounds, &mesh_bb, brush, brush_radius)) { /* Build a bvh tree from transformed vertices */ - if (bvhtree_from_mesh_looptri(&treeData, dm, 0.0f, 4, 8)) { + if (bvhtree_from_mesh_get(&treeData, dm, BVHTREE_FROM_LOOPTRI, 4)) { int c_index; int total_cells = grid->dim[0] * grid->dim[1] * grid->dim[2]; |