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/makesrna/intern/rna_particle.c | |
parent | 91808a67e8d5c0b16fb7580a6cab771f0e2d9a0d (diff) | |
parent | aea44561017ccfba58bd97741dde1508aa826a44 (diff) |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/makesrna/intern/rna_particle.c')
-rw-r--r-- | source/blender/makesrna/intern/rna_particle.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/source/blender/makesrna/intern/rna_particle.c b/source/blender/makesrna/intern/rna_particle.c index b40519386cc..0f2eb9412e7 100644 --- a/source/blender/makesrna/intern/rna_particle.c +++ b/source/blender/makesrna/intern/rna_particle.c @@ -494,6 +494,9 @@ static int rna_ParticleSystem_tessfaceidx_on_emitter(ParticleSystem *particlesys *r_fuv = &particle->fuv; + /* 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 i = 0; i < totface; i++, mface++) { if (ELEM(num, mface->v1, mface->v2, mface->v3, mface->v4)) { return i; @@ -533,6 +536,9 @@ static int rna_ParticleSystem_tessfaceidx_on_emitter(ParticleSystem *particlesys *r_fuv = &parent->fuv; + /* 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 i = 0; i < totface; i++, mface++) { if (ELEM(num, mface->v1, mface->v2, mface->v3, mface->v4)) { return i; |