[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [42919] branches/bmesh/blender: svn merge ^/trunk/blender -r42914:42918

[Campbell Barton]

Revision: 42919
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=42919
Author:   campbellbarton
Date:     2011-12-28 10:27:25 +0000 (Wed, 28 Dec 2011)
Log Message:
-----------
svn merge ^/trunk/blender -r42914:42918

Revision Links:
--------------
    http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=42914

Modified Paths:
--------------
    branches/bmesh/blender/source/blender/blenkernel/intern/customdata.c
    branches/bmesh/blender/source/blender/modifiers/intern/MOD_explode.c

Property Changed:
----------------
    branches/bmesh/blender/


Property changes on: branches/bmesh/blender
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/soc-2011-cucumber:37517
/branches/soc-2011-tomato:42376,42378-42379,42397,42400
/trunk/blender:39992-42914
   + /branches/soc-2011-cucumber:37517
/branches/soc-2011-tomato:42376,42378-42379,42397,42400
/trunk/blender:39992-42918

Modified: branches/bmesh/blender/source/blender/blenkernel/intern/customdata.c
===================================================================
--- branches/bmesh/blender/source/blender/blenkernel/intern/customdata.c	2011-12-28 10:20:37 UTC (rev 42918)
+++ branches/bmesh/blender/source/blender/blenkernel/intern/customdata.c	2011-12-28 10:27:25 UTC (rev 42919)
@@ -1138,7 +1138,6 @@
 	CD_MASK_MTFACE | CD_MASK_MCOL | CD_MASK_MTEXPOLY | CD_MASK_MLOOPUV |
 	CD_MASK_MLOOPCOL;
 
-
 static const LayerTypeInfo *layerType_getInfo(int type)
 {
 	if(type < 0 || type >= CD_NUMTYPES) return NULL;

Modified: branches/bmesh/blender/source/blender/modifiers/intern/MOD_explode.c
===================================================================
--- branches/bmesh/blender/source/blender/modifiers/intern/MOD_explode.c	2011-12-28 10:20:37 UTC (rev 42918)
+++ branches/bmesh/blender/source/blender/modifiers/intern/MOD_explode.c	2011-12-28 10:27:25 UTC (rev 42919)
@@ -556,10 +556,11 @@
 	int *vertpa = MEM_callocN(sizeof(int)*totvert,"explode_vertpa2");
 	int *facepa = emd->facepa;
 	int *fs, totesplit=0,totfsplit=0,curdupface=0;
-	int i,j,v1,v2,v3,v4,esplit,
+	int i, v1, v2, v3, v4, esplit,
 	    v[4]  = {0, 0, 0, 0}, /* To quite gcc barking... */
 	    uv[4] = {0, 0, 0, 0}; /* To quite gcc barking... */
 	int numlayer;
+	unsigned int ed_v1, ed_v2;
 
 	edgehash= BLI_edgehash_new();
 
@@ -655,16 +656,16 @@
 	/* create new verts */
 	ehi= BLI_edgehashIterator_new(edgehash);
 	for(; !BLI_edgehashIterator_isDone(ehi); BLI_edgehashIterator_step(ehi)) {
-		BLI_edgehashIterator_getKey(ehi, &i, &j);
+		BLI_edgehashIterator_getKey(ehi, &ed_v1, &ed_v2);
 		esplit= GET_INT_FROM_POINTER(BLI_edgehashIterator_getValue(ehi));
-		mv=CDDM_get_vert(splitdm,j);
+		mv=CDDM_get_vert(splitdm, ed_v2);
 		dupve=CDDM_get_vert(splitdm,esplit);
 
-		DM_copy_vert_data(splitdm,splitdm,j,esplit,1);
+		DM_copy_vert_data(splitdm,splitdm, ed_v2, esplit,1);
 
 		*dupve=*mv;
 
-		mv=CDDM_get_vert(splitdm,i);
+		mv=CDDM_get_vert(splitdm, ed_v1);
 
 		add_v3_v3(dupve->co, mv->co);
 		mul_v3_fl(dupve->co, 0.5f);
@@ -797,7 +798,8 @@
 	/* float timestep; */
 	int *facepa=emd->facepa;
 	int totdup=0,totvert=0,totface=0,totpart=0;
-	int i, j, v, mindex=0;
+	int i, v, mindex=0;
+	unsigned int ed_v1, ed_v2;
 	MTFace *mtface = NULL, *mtf;
 
 	totface= dm->getNumTessFaces(dm);
@@ -860,24 +862,24 @@
 		MVert *dest;
 
 		/* get particle + vertex from hash */
-		BLI_edgehashIterator_getKey(ehi, &j, &i);
-		i -= totvert;
+		BLI_edgehashIterator_getKey(ehi, &ed_v1, &ed_v2);
+		ed_v2 -= totvert;
 		v= GET_INT_FROM_POINTER(BLI_edgehashIterator_getValue(ehi));
 
-		dm->getVert(dm, j, &source);
+		dm->getVert(dm, ed_v1, &source);
 		dest = CDDM_get_vert(explode,v);
 
-		DM_copy_vert_data(dm,explode,j,v,1);
+		DM_copy_vert_data(dm, explode, ed_v1, v, 1);
 		*dest = source;
 
-		if(i!=totpart) {
+		if(ed_v2 != totpart) {
 			/* get particle */
-			pa= pars+i;
+			pa= pars + ed_v2;
 
 			psys_get_birth_coordinates(&sim, pa, &birth, 0, 0);
 
 			state.time=cfra;
-			psys_get_particle_state(&sim, i, &state, 1);
+			psys_get_particle_state(&sim, ed_v2, &state, 1);
 
 			vertco=CDDM_get_vert(explode,v)->co;
 			mul_m4_v3(ob->obmat,vertco);