diff options
| author | Janne Karhu <jhkarh@gmail.com> | 2011-02-16 14:38:28 +0300 |
|---|---|---|
| committer | Janne Karhu <jhkarh@gmail.com> | 2011-02-16 14:38:28 +0300 |
| commit | f6911cfe3839d0eda5bffbb65043732c504667f2 (patch) | |
| tree | c067410208eb5a07f75b81fded04201d39d8a3f3 /source/blender/modifiers/intern | |
| parent | d6da81be388f173ffe1e90f1c262336483b2e230 (diff) | |
Fix for [#26102] Particle Texture mismapped on Multires (in some modes)
* Particle modifier didn't check for particle textures using uv-coordinates properly.
Diffstat (limited to 'source/blender/modifiers/intern')
| -rw-r--r-- | source/blender/modifiers/intern/MOD_particlesystem.c | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/source/blender/modifiers/intern/MOD_particlesystem.c b/source/blender/modifiers/intern/MOD_particlesystem.c index c7638afbbcc..246a1b5391e 100644 --- a/source/blender/modifiers/intern/MOD_particlesystem.c +++ b/source/blender/modifiers/intern/MOD_particlesystem.c @@ -91,14 +91,10 @@ static CustomDataMask requiredDataMask(Object *ob, ModifierData *md) if(!psmd->psys->part) return 0; - ma= give_current_material(ob, psmd->psys->part->omat); - if(ma) { - for(i=0; i<MAX_MTEX; i++) { - mtex=ma->mtex[i]; - if(mtex && (ma->septex & (1<<i))==0) - if(mtex->pmapto && (mtex->texco & TEXCO_UV)) - dataMask |= CD_MASK_MTFACE; - } + for(i=0; i<MAX_MTEX; i++) { + mtex = psmd->psys->part->mtex[i]; + if(mtex && mtex->mapto && (mtex->texco & TEXCO_UV)) + dataMask |= CD_MASK_MTFACE; } if(psmd->psys->part->tanfac!=0.0) |