diff options
| author | Sybren A. Stüvel <sybren@stuvel.eu> | 2017-07-05 23:25:05 +0300 |
|---|---|---|
| committer | Sybren A. Stüvel <sybren@stuvel.eu> | 2017-07-05 23:25:05 +0300 |
| commit | cb554981594cd734f877a2ff78daec6622ecee83 (patch) | |
| tree | e97a54862316713c257fccfc404e91268d39e003 /source/blender/blenkernel/intern/particle.c | |
| parent | 91808a67e8d5c0b16fb7580a6cab771f0e2d9a0d (diff) | |
| parent | aea44561017ccfba58bd97741dde1508aa826a44 (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/blenkernel/intern/particle.c')
| -rw-r--r-- | source/blender/blenkernel/intern/particle.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/source/blender/blenkernel/intern/particle.c b/source/blender/blenkernel/intern/particle.c index f34a680b52d..a8253b9dc3c 100644 --- a/source/blender/blenkernel/intern/particle.c +++ b/source/blender/blenkernel/intern/particle.c @@ -3415,6 +3415,9 @@ static int get_particle_uv(DerivedMesh *dm, ParticleData *pa, int index, const f if (from_vert) { mf = dm->getTessFaceDataArray(dm, CD_MFACE); + /* This finds the first face to contain the emitting vertex, + * this is not ideal, but is mostly fine as UV seams generally + * map to equal-colored parts of a texture */ for (int j = 0; j < dm->getNumTessFaces(dm); j++, mf++) { if (ELEM(i, mf->v1, mf->v2, mf->v3, mf->v4)) { i = j; |