[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [58236] trunk/blender/source/blender: fix for case where negative index was used when rendering particles with UV 's, also removed redundant array check.

[Campbell Barton]

Revision: 58236
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=58236
Author:   campbellbarton
Date:     2013-07-14 13:18:05 +0000 (Sun, 14 Jul 2013)
Log Message:
-----------
fix for case where negative index was used when rendering particles with UV's, also removed redundant array check.

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

Modified: trunk/blender/source/blender/blenkernel/intern/particle.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/particle.c	2013-07-14 12:58:21 UTC (rev 58235)
+++ trunk/blender/source/blender/blenkernel/intern/particle.c	2013-07-14 13:18:05 UTC (rev 58236)
@@ -4510,7 +4510,7 @@
 			num = DMCACHE_NOTFOUND;
 		}
 
-		if (mtface && num != DMCACHE_NOTFOUND) {
+		if (mtface && !ELEM(num, DMCACHE_NOTFOUND, DMCACHE_ISCHILD)) {
 			mface = psmd->dm->getTessFaceData(psmd->dm, num, CD_MFACE);
 			mtface += num;
 			psys_interpolate_uvs(mtface, mface->v4, pa->fuv, uv);

Modified: trunk/blender/source/blender/modifiers/intern/MOD_screw.c
===================================================================
--- trunk/blender/source/blender/modifiers/intern/MOD_screw.c	2013-07-14 12:58:21 UTC (rev 58235)
+++ trunk/blender/source/blender/modifiers/intern/MOD_screw.c	2013-07-14 13:18:05 UTC (rev 58236)
@@ -646,7 +646,7 @@
 					else {
 						/* only 1 edge connected - same as above except
 						 * don't need to average edge direction */
-						if (vc->e && vc->e[0]->v2 == i) {
+						if (vc->e[0]->v2 == i) {
 							sub_v3_v3v3(tmp_vec1, mvert_new[i].co, mvert_new[vc->v[0]].co);
 						}
 						else {