[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [34902] trunk/blender/source/blender/ modifiers/intern/MOD_particlesystem.c: Fix for [#26102] Particle Texture mismapped on Multires (in some modes)

[Janne Karhu]

Revision: 34902
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=34902
Author:   jhk
Date:     2011-02-16 11:38:28 +0000 (Wed, 16 Feb 2011)
Log Message:
-----------
Fix for [#26102] Particle Texture mismapped on Multires (in some modes)
* Particle modifier didn't check for particle textures using uv-coordinates properly.

Modified Paths:
--------------
    trunk/blender/source/blender/modifiers/intern/MOD_particlesystem.c

Modified: trunk/blender/source/blender/modifiers/intern/MOD_particlesystem.c
===================================================================
--- trunk/blender/source/blender/modifiers/intern/MOD_particlesystem.c	2011-02-16 11:28:25 UTC (rev 34901)
+++ trunk/blender/source/blender/modifiers/intern/MOD_particlesystem.c	2011-02-16 11:38:28 UTC (rev 34902)
@@ -91,14 +91,10 @@
 	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)