diff options
| author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2013-08-08 22:12:07 +0400 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2013-08-08 22:12:07 +0400 |
| commit | f07fda5a855bd0ee581e631f06707f4cc41074b2 (patch) | |
| tree | 4447ca13d8980a528ecd5c1e04218c4c7bc973df | |
| parent | d0e5c26e83c0e5686171ca380aaf0c245ae273c8 (diff) | |
Fix #36274: empty particle texture slots should not have any influence, same
as for materials, world, lamps, etc.
| -rw-r--r-- | source/blender/blenkernel/intern/particle.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/blenkernel/intern/particle.c b/source/blender/blenkernel/intern/particle.c index 6bea4bec3ce..6b754743c11 100644 --- a/source/blender/blenkernel/intern/particle.c +++ b/source/blender/blenkernel/intern/particle.c @@ -3836,7 +3836,7 @@ static void get_cpa_texture(DerivedMesh *dm, ParticleSystem *psys, ParticleSetti for (m = 0; m < MAX_MTEX; m++, mtexp++) { mtex = *mtexp; - if (mtex && mtex->mapto) { + if (mtex && mtex->tex && mtex->mapto) { float def = mtex->def_var; short blend = mtex->blendtype; short texco = mtex->texco; @@ -3904,7 +3904,7 @@ void psys_get_texture(ParticleSimulationData *sim, ParticleData *pa, ParticleTex for (m = 0; m < MAX_MTEX; m++, mtexp++) { mtex = *mtexp; - if (mtex && mtex->mapto) { + if (mtex && mtex->tex && mtex->mapto) { float def = mtex->def_var; short blend = mtex->blendtype; short texco = mtex->texco; |