diff options
| author | Miika Hamalainen <blender@miikah.org> | 2012-01-19 15:13:41 +0400 |
|---|---|---|
| committer | Miika Hamalainen <blender@miikah.org> | 2012-01-19 15:13:41 +0400 |
| commit | 25a5915650db32c3208fd1a5b0a4aa1e32362a7e (patch) | |
| tree | af8465870a8d5b3c45bcf9c4c8b31aab5a6263a4 /source/blender/blenkernel/intern/dynamicpaint.c | |
| parent | a87c5eb52cd4951b138f518bf12d498bc5e5eb8a (diff) | |
Dynamic Paint:
* Added "Project" option also for "Volume + Proximity" brush type.
Diffstat (limited to 'source/blender/blenkernel/intern/dynamicpaint.c')
| -rw-r--r-- | source/blender/blenkernel/intern/dynamicpaint.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/blenkernel/intern/dynamicpaint.c b/source/blender/blenkernel/intern/dynamicpaint.c index 50f42328043..fc0fe37d106 100644 --- a/source/blender/blenkernel/intern/dynamicpaint.c +++ b/source/blender/blenkernel/intern/dynamicpaint.c @@ -3172,7 +3172,7 @@ static int dynamicPaint_paintMesh(DynamicPaintSurface *surface, boundInsert(&mesh_bb, mvert[ii].co); /* for project brush calculate average normal */ - if (brush->collision & MOD_DPAINT_COL_DIST && brush->flags & MOD_DPAINT_PROX_PROJECT) { + if (brush->flags & MOD_DPAINT_PROX_PROJECT) { float nor[3]; normal_short_to_float_v3(nor, mvert[ii].no); mul_mat3_m4_v3(brushOb->obmat, nor); @@ -3182,7 +3182,7 @@ static int dynamicPaint_paintMesh(DynamicPaintSurface *surface, } } - if (brush->collision & MOD_DPAINT_COL_DIST && brush->flags & MOD_DPAINT_PROX_PROJECT) { + if (brush->flags & MOD_DPAINT_PROX_PROJECT) { mul_v3_fl(avg_brushNor, 1.0f/(float)numOfVerts); /* instead of null vector use positive z */ if (!(MIN3(avg_brushNor[0],avg_brushNor[1],avg_brushNor[2]))) @@ -3323,7 +3323,7 @@ static int dynamicPaint_paintMesh(DynamicPaintSurface *surface, if (inner_proximity && !hit_found) continue; /* If pure distance proximity, find the nearest point on the mesh */ - if (brush->collision != MOD_DPAINT_COL_DIST || !(brush->flags & MOD_DPAINT_PROX_PROJECT)) { + if (!(brush->flags & MOD_DPAINT_PROX_PROJECT)) { if (BLI_bvhtree_find_nearest(treeData.tree, ray_start, &nearest, mesh_faces_nearest_point_dp, &treeData) != -1) { proxDist = sqrtf(nearest.dist); copy_v3_v3(hitCo, nearest.co); |