diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2018-03-23 14:05:55 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2018-03-23 14:05:55 +0300 |
| commit | 8eb8aa49397fb038ffa98dbe5dc4aed86e7b3e94 (patch) | |
| tree | f5742a0f4414a99bd6738aae9cf4dc21b307fbfc /source/blender/blenkernel/intern/dynamicpaint.c | |
| parent | da00a50f7f48bfd95924705e69babea41f9d7b2b (diff) | |
| parent | 7cc2b27099b7435cc1a29a48ae0e4c8335d811f3 (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/blenkernel/intern/dynamicpaint.c')
| -rw-r--r-- | source/blender/blenkernel/intern/dynamicpaint.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/blenkernel/intern/dynamicpaint.c b/source/blender/blenkernel/intern/dynamicpaint.c index 22a1f9b4b18..ee678dd4c41 100644 --- a/source/blender/blenkernel/intern/dynamicpaint.c +++ b/source/blender/blenkernel/intern/dynamicpaint.c @@ -54,7 +54,7 @@ #include "BKE_animsys.h" #include "BKE_armature.h" -#include "BKE_bvhutils.h" /* bvh tree */ +#include "BKE_bvhutils.h" /* bvh tree */ #include "BKE_colorband.h" #include "BKE_cdderivedmesh.h" #include "BKE_constraint.h" @@ -4516,7 +4516,7 @@ static int dynamicPaint_paintParticles(DynamicPaintSurface *surface, */ tree = BLI_kdtree_new(psys->totpart); - /* loop through particles and insert valid ones to the tree */ + /* loop through particles and insert valid ones to the tree */ p = 0; for (ParticleData *pa = psys->particles; p < psys->totpart; p++, pa++) { /* Proceed only if particle is active */ |