[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [60549] trunk/blender/source/blender/ blenkernel/intern/particle.c: Fix obvious bug in particle code ( copying normal into nor when in if(ornor) block...), though probably harmless in current code...

[Bastien Montagne]

Revision: 60549
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=60549
Author:   mont29
Date:     2013-10-04 14:28:32 +0000 (Fri, 04 Oct 2013)
Log Message:
-----------
Fix obvious bug in particle code (copying normal into nor when in if(ornor) block...), though probably harmless in current code...

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	2013-10-04 13:40:21 UTC (rev 60548)
+++ trunk/blender/source/blender/blenkernel/intern/particle.c	2013-10-04 14:28:32 UTC (rev 60549)
@@ -1792,7 +1792,9 @@
 	float (*orcodata)[3];
 	int mapindex;
 
+	printf("%s\n", __func__);
 	if (!psys_map_index_on_dm(dm, from, index, index_dmcache, fw, foffset, &mapindex, mapfw)) {
+		printf("psys_map_index_on_dm failed for %d (from mode: %d)!\n", index, from);
 		if (vec) { vec[0] = vec[1] = vec[2] = 0.0; }
 		if (nor) { nor[0] = nor[1] = 0.0; nor[2] = 1.0; }
 		if (orco) { orco[0] = orco[1] = orco[2] = 0.0; }
@@ -1817,8 +1819,8 @@
 			copy_v3_v3(orco, orcodata[mapindex]);
 
 		if (ornor) {
-			dm->getVertNo(dm, mapindex, nor);
-			normalize_v3(nor);
+			dm->getVertNo(dm, mapindex, ornor);
+			normalize_v3(ornor);
 		}
 
 		if (utan && vtan) {
@@ -1843,7 +1845,7 @@
 			if (nor)
 				copy_v3_v3(nor, tmpnor);
 
-			normalize_v3(tmpnor);
+			normalize_v3(tmpnor);  /* XXX Why not normalize tmpnor before copying it into nor??? -- mont29 */
 			mul_v3_fl(tmpnor, -foffset);
 			add_v3_v3(vec, tmpnor);
 		}