[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [34947] trunk/blender/source/blender/ blenkernel/intern/particle.c: Particle textures didn' t use original coordinates properly for grid distribution.

[Janne Karhu]

Revision: 34947
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=34947
Author:   jhk
Date:     2011-02-18 00:17:46 +0000 (Fri, 18 Feb 2011)
Log Message:
-----------
Particle textures didn't use original coordinates properly for grid distribution.

Modified Paths:
--------------
    trunk/blender/source/blender/blenkernel/intern/particle.c

Modified: trunk/blender/source/blender/blenkernel/intern/particle.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/particle.c	2011-02-17 23:34:07 UTC (rev 34946)
+++ trunk/blender/source/blender/blenkernel/intern/particle.c	2011-02-18 00:17:46 UTC (rev 34947)
@@ -1831,9 +1831,11 @@
 void psys_particle_on_emitter(ParticleSystemModifierData *psmd, int from, int index, int index_dmcache, float *fuv, float foffset, float *vec, float *nor, float *utan, float *vtan, float *orco, float *ornor){
 	if(psmd){
 		if(psmd->psys->part->distr==PART_DISTR_GRID && psmd->psys->part->from != PART_FROM_VERT){
-			if(vec){
-				VECCOPY(vec,fuv);
-			}
+			if(vec)
+				copy_v3_v3(vec,fuv);
+
+			if(orco)
+				copy_v3_v3(orco, fuv);
 			return;
 		}
 		/* we cant use the num_dmcache */
@@ -3780,7 +3782,7 @@
 			short blend=mtex->blendtype;
 			short texco = mtex->texco;
 
-			if(ELEM(texco, TEXCO_UV, TEXCO_ORCO) && (ELEM(part->from, PART_FROM_FACE, PART_FROM_VOLUME) == 0 || part->distr == PART_DISTR_GRID))
+			if(texco == TEXCO_UV && (ELEM(part->from, PART_FROM_FACE, PART_FROM_VOLUME) == 0 || part->distr == PART_DISTR_GRID))
 				texco = TEXCO_GLOB;
 
 			switch(texco) {