[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [42431] branches/bmesh/blender/source/ blender/blenkernel/intern: commenting out code added in bmesh and not verified.

[Campbell Barton]

Revision: 42431
          
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=42431
Author:   campbellbarton
Date:     2011-12-05 05:28:31 +0000 (Mon, 05 Dec 2011)
Log Message:
-----------
commenting out code added in bmesh and not verified.

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

Modified: branches/bmesh/blender/source/blender/blenkernel/intern/object.c
===================================================================
--- branches/bmesh/blender/source/blender/blenkernel/intern/object.c    
2011-12-05 02:57:30 UTC (rev 42430)
+++ branches/bmesh/blender/source/blender/blenkernel/intern/object.c    
2011-12-05 05:28:31 UTC (rev 42431)
@@ -1765,6 +1765,7 @@
 
                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 @@
                                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;
                        

Modified: branches/bmesh/blender/source/blender/blenkernel/intern/shrinkwrap.c
===================================================================
--- branches/bmesh/blender/source/blender/blenkernel/intern/shrinkwrap.c        
2011-12-05 02:57:30 UTC (rev 42430)
+++ branches/bmesh/blender/source/blender/blenkernel/intern/shrinkwrap.c        
2011-12-05 05:28:31 UTC (rev 42431)
@@ -93,8 +93,7 @@
        Mesh *me= ob->data;
        BMEditMesh *em = me->edit_btmesh;
 
-       if (em)
-       {
+       if(em) {
                DerivedMesh *dm = em->derivedFinal;
                return dm;
        }

Modified: branches/bmesh/blender/source/blender/blenkernel/intern/subsurf_ccg.c
===================================================================
--- branches/bmesh/blender/source/blender/blenkernel/intern/subsurf_ccg.c       
2011-12-05 02:57:30 UTC (rev 42430)
+++ branches/bmesh/blender/source/blender/blenkernel/intern/subsurf_ccg.c       
2011-12-05 05:28:31 UTC (rev 42431)
@@ -164,8 +164,7 @@
                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 @@
                int edgeSize = ccgSubSurf_getEdgeSize(ss);
                int gridSideEdges;
                int gridInternalEdges;
+
+               /* 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 @@
                                }
 
                                i = i > 0 ? i - 1 : i;
+#endif
+
+               i = 0;
                while(i < lastface && edgeNum >= cgdm->faceMap[i + 1].startEdge)
                        ++i;
 
@@ -3222,16 +3226,16 @@
        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;

_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs