[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [12604] branches/particles/source/blender/ blenkernel/intern:

[Brecht Van Lommel]

Revision: 12604
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=12604
Author:   blendix
Date:     2007-11-16 13:02:06 +0100 (Fri, 16 Nov 2007)

Log Message:
-----------

Particle Branch
===============

Accidentaly committed wrong file with debug code in last commit.

Modified Paths:
--------------
    branches/particles/source/blender/blenkernel/intern/particle.c
    branches/particles/source/blender/blenkernel/intern/particle_system.c

Modified: branches/particles/source/blender/blenkernel/intern/particle.c
===================================================================
--- branches/particles/source/blender/blenkernel/intern/particle.c	2007-11-16 09:54:28 UTC (rev 12603)
+++ branches/particles/source/blender/blenkernel/intern/particle.c	2007-11-16 12:02:06 UTC (rev 12604)
@@ -913,7 +913,6 @@
 			if (uv_index>=0)
 				layer_uv=&dm->faceData.layers[uv_index];
 			
-			fuv[1]= 1-fuv[1];
 			if (index_dmcache == -1) {
 				i = psys_particle_dm_face_lookup(dm, index, fuv, (LinkNode*)NULL);
 			} else {
@@ -934,17 +933,7 @@
 			mtface= dm->getFaceData(dm, i, CD_MTFACE); 
 			osface= dm->getFaceData(dm, i, CD_ORIGSPACE);
 			
-#if 0
-			/* TODO brecht: properly fix this */
-			if (index_dmcache == -1)
-				PointInFace2DUV(mface->v4, osface->uv[0], osface->uv[1], osface->uv[2], osface->uv[3], fuv, fuv_mod);
-			else {
-				fuv_mod[0]= fuv[0];
-				fuv_mod[1]= fuv[1];
-			}
-#endif
 			PointInFace2DUV(mface->v4, osface->uv[0], osface->uv[1], osface->uv[2], osface->uv[3], fuv, fuv_mod);
-			fuv[1]= 1-fuv[1];
 			
 			psys_interpolate_face(mvert,mface,mtface,fuv_mod,vec,nor,utan,vtan);
 			

Modified: branches/particles/source/blender/blenkernel/intern/particle_system.c
===================================================================
--- branches/particles/source/blender/blenkernel/intern/particle_system.c	2007-11-16 09:54:28 UTC (rev 12603)
+++ branches/particles/source/blender/blenkernel/intern/particle_system.c	2007-11-16 12:02:06 UTC (rev 12604)
@@ -3989,6 +3989,9 @@
 	if(psys->effectors.first)
 		precalc_effectors(ob,psys,psmd);
 		
+	if(psys_in_edit_mode(psys))
+		PE_recalc_world_cos(ob, psys);
+
 	psys_update_path_cache(ob,psmd,psys,cfra);
 }