[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [42058] branches/bmesh/blender/source/ blender/blenkernel/intern: fixes from last merge

[Campbell Barton]

Revision: 42058
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=42058
Author:   campbellbarton
Date:     2011-11-22 12:05:46 +0000 (Tue, 22 Nov 2011)
Log Message:
-----------
fixes from last merge

Modified Paths:
--------------
    branches/bmesh/blender/source/blender/blenkernel/intern/cdderivedmesh.c
    branches/bmesh/blender/source/blender/blenkernel/intern/subsurf_ccg.c

Modified: branches/bmesh/blender/source/blender/blenkernel/intern/cdderivedmesh.c
===================================================================
--- branches/bmesh/blender/source/blender/blenkernel/intern/cdderivedmesh.c	2011-11-22 11:51:42 UTC (rev 42057)
+++ branches/bmesh/blender/source/blender/blenkernel/intern/cdderivedmesh.c	2011-11-22 12:05:46 UTC (rev 42058)
@@ -1750,7 +1750,7 @@
 	return dm;
 }
 
-static DerivedMesh *disabled__CDDM_from_editmesh(EditMesh *em, Mesh *UNUSED(me))
+static DerivedMesh *UNUSED_FUNCTION(CDDM_from_editmesh)(EditMesh *em, Mesh *UNUSED(me))
 {
 	DerivedMesh *dm = CDDM_new(BLI_countlist(&em->verts),
 	                           BLI_countlist(&em->edges),

Modified: branches/bmesh/blender/source/blender/blenkernel/intern/subsurf_ccg.c
===================================================================
--- branches/bmesh/blender/source/blender/blenkernel/intern/subsurf_ccg.c	2011-11-22 11:51:42 UTC (rev 42057)
+++ branches/bmesh/blender/source/blender/blenkernel/intern/subsurf_ccg.c	2011-11-22 12:05:46 UTC (rev 42058)
@@ -1485,7 +1485,7 @@
 	int i, j, edgeSize = ccgSubSurf_getEdgeSize(ss);
 
 	for (j=0; j< totedge; j++) {
-		CCGEdge *e = ccgdm->edgeMap[j].edge;
+		CCGEdge *e = cgdm->edgeMap[j].edge;
 		DMGridData *edgeData = ccgSubSurf_getEdgeDataArray(ss, e);
 
 		if (!ccgSubSurf_getEdgeNumFaces(e)) {
@@ -1920,7 +1920,7 @@
 	glBegin(GL_QUADS);
 	totface = ccgSubSurf_getNumFaces(ss);
 	for(i = 0; i < totface; i++) {
-		CCGFace *f = ccgdm->faceMap[i].face;
+		CCGFace *f = cgdm->faceMap[i].face;
 		int S, x, y, numVerts = ccgSubSurf_getFaceNumVerts(f);
 
 		for (S=0; S<numVerts; S++) {