commenting out code added in bmesh and not verified.

3 files changed, 14 insertions, 9 deletions

diff --git a/source/blender/blenkernel/intern/object.c b/source/blender/blenkernel/intern/object.c
index 68269ef3aac..9d25c8862c9 100644
--- a/source/blender/blenkernel/intern/object.c
+++ b/source/blender/blenkernel/intern/object.c
@@ -1765,6 +1765,7 @@ static void give_parvert(Object *par, int nr, float *vec)
 
 		em = me->edit_btmesh;
 
+#if 0	/* this was bmesh only, better, evaluate why this was needed - campbell*/
 		if(em) {
 			BMVert *eve;
 			BMIter iter;
@@ -1773,11 +1774,12 @@ static void give_parvert(Object *par, int nr, float *vec)
 				int *keyindex = CustomData_bmesh_get(&em->bm->vdata, eve->head.data, CD_SHAPE_KEYINDEX);
 				
 				if(keyindex && *keyindex==nr) {
-					memcpy(vec, eve->co, sizeof(float)*3);
+					copy_v3_v3(vec, eve->co);
 					break;
 				}
 			}
 		}
+#endif
 
 		dm = (em)? em->derivedFinal: par->derivedFinal;
 			
diff --git a/source/blender/blenkernel/intern/shrinkwrap.c b/source/blender/blenkernel/intern/shrinkwrap.c
index fb8bb791f32..820d474253f 100644
--- a/source/blender/blenkernel/intern/shrinkwrap.c
+++ b/source/blender/blenkernel/intern/shrinkwrap.c
@@ -93,8 +93,7 @@ DerivedMesh *object_get_derived_final(Object *ob)
 	Mesh *me= ob->data;
 	BMEditMesh *em = me->edit_btmesh;
 
-	if (em)
-	{
+	if(em) {
 		DerivedMesh *dm = em->derivedFinal;
 		return dm;
 	}
diff --git a/source/blender/blenkernel/intern/subsurf_ccg.c b/source/blender/blenkernel/intern/subsurf_ccg.c
index af987a774e3..cedb1390799 100644
--- a/source/blender/blenkernel/intern/subsurf_ccg.c
+++ b/source/blender/blenkernel/intern/subsurf_ccg.c
@@ -164,8 +164,7 @@ static int getEdgeIndex(CCGSubSurf *ss, CCGEdge *e, int x, int edgeSize) {
 		return edgeBase + x-1;
 	}
 }
-
-BM_INLINE int getFaceIndex(CCGSubSurf *ss, CCGFace *f, int S, int x, int y, int edgeSize, int gridSize) {
+static int getFaceIndex(CCGSubSurf *ss, CCGFace *f, int S, int x, int y, int edgeSize, int gridSize) {
 	int faceBase = *((int*) ccgSubSurf_getFaceUserData(ss, f));
 	int numVerts = ccgSubSurf_getFaceNumVerts(f);
 
@@ -798,8 +797,10 @@ static void ccgDM_getFinalEdge(DerivedMesh *dm, int edgeNum, MEdge *med)
 		int edgeSize = ccgSubSurf_getEdgeSize(ss);
 		int gridSideEdges;
 		int gridInternalEdges;
-				int lasti, previ;
 
+		/* code added in bmesh but works correctly without, commenting - campbell */
+#if 0
+				int lasti, previ;
 				i = lastface;
 				lasti = 0;
 				while (1) {
@@ -830,6 +831,9 @@ static void ccgDM_getFinalEdge(DerivedMesh *dm, int edgeNum, MEdge *med)
 				}
 
 				i = i > 0 ? i - 1 : i;
+#endif
+
+		i = 0;
 		while(i < lastface && edgeNum >= cgdm->faceMap[i + 1].startEdge)
 			++i;
 
@@ -3222,16 +3226,16 @@ static CCGDerivedMesh *getCCGDerivedMesh(CCGSubSurf *ss,
 	for(index = 0; index < totvert; ++index) {
 		CCGVert *v = ccgdm->vertMap[index].vert;
 		int mapIndex = ccgDM_getVertMapIndex(ccgdm->ss, v);
-		int vidx;
+		int vertIdx;
 
-		vidx = GET_INT_FROM_POINTER(ccgSubSurf_getVertVertHandle(v));
+		vertIdx = GET_INT_FROM_POINTER(ccgSubSurf_getVertVertHandle(v));
 
 		ccgdm->vertMap[index].startVert = vertNum;
 
 		/* set the vert base vert */
 		*((int*) ccgSubSurf_getVertUserData(ss, v)) = vertNum;
 
-		DM_copy_vert_data(dm, &ccgdm->dm, vidx, vertNum, 1);
+		DM_copy_vert_data(dm, &ccgdm->dm, vertIdx, vertNum, 1);
 
 		if (vertOrigIndex) {
 			*vertOrigIndex = mapIndex;