diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2013-07-14 17:18:05 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2013-07-14 17:18:05 +0400 |
| commit | 83a172e40c50c630b7bdd58b0b4a24a1f4284bfa (patch) | |
| tree | 5c73455d7d8c161cd564e40cf5f8e72af9259e35 /source | |
| parent | cad3406c812bf2b2c8d2994a68db0e9a68071268 (diff) | |
fix for case where negative index was used when rendering particles with UV's, also removed redundant array check.
Diffstat (limited to 'source')
| -rw-r--r-- | source/blender/blenkernel/intern/particle.c | 2 | ||||
| -rw-r--r-- | source/blender/modifiers/intern/MOD_screw.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/blenkernel/intern/particle.c b/source/blender/blenkernel/intern/particle.c index b3f29fe8ce1..6bea4bec3ce 100644 --- a/source/blender/blenkernel/intern/particle.c +++ b/source/blender/blenkernel/intern/particle.c @@ -4510,7 +4510,7 @@ void psys_get_dupli_texture(ParticleSystem *psys, ParticleSettings *part, num = DMCACHE_NOTFOUND; } - if (mtface && num != DMCACHE_NOTFOUND) { + if (mtface && !ELEM(num, DMCACHE_NOTFOUND, DMCACHE_ISCHILD)) { mface = psmd->dm->getTessFaceData(psmd->dm, num, CD_MFACE); mtface += num; psys_interpolate_uvs(mtface, mface->v4, pa->fuv, uv); diff --git a/source/blender/modifiers/intern/MOD_screw.c b/source/blender/modifiers/intern/MOD_screw.c index 0d098db3203..0dd2f2770a4 100644 --- a/source/blender/modifiers/intern/MOD_screw.c +++ b/source/blender/modifiers/intern/MOD_screw.c @@ -646,7 +646,7 @@ static DerivedMesh *applyModifier(ModifierData *md, Object *ob, else { /* only 1 edge connected - same as above except * don't need to average edge direction */ - if (vc->e && vc->e[0]->v2 == i) { + if (vc->e[0]->v2 == i) { sub_v3_v3v3(tmp_vec1, mvert_new[i].co, mvert_new[vc->v[0]].co); } else { |