Merging r41246 through r41535 from trunk into soc-2011-tomato
[blender.git] / source / blender / blenkernel / intern / BME_conversions.c
index 64a6e14bc5d187d43f0af230e7edb3062a5e3100..ce1da6132cdfcbfbbb801add91228cb39f9a8a9b 100644 (file)
@@ -1,9 +1,8 @@
-/**
+/*
  * BME_mesh.c    jan 2007
  *
  *     BMesh mesh level functions.
  *
- * $Id$
  *
  * ***** BEGIN GPL LICENSE BLOCK *****
  *
  * ***** END GPL LICENSE BLOCK *****
  */
 
+/** \file blender/blenkernel/intern/BME_conversions.c
+ *  \ingroup bke
+ */
+
+
 #include "MEM_guardedalloc.h"
 
 #include "DNA_meshdata_types.h"
 #include "DNA_object_types.h"
 #include "DNA_scene_types.h"
 
+#include "BLI_edgehash.h"
+#include "BLI_listbase.h"
+#include "BLI_utildefines.h"
+
 #include "BKE_mesh.h"
 #include "BKE_cdderivedmesh.h"
 
-#include "BLI_edgehash.h"
 //XXX #include "BIF_editmesh.h"
 //XXX #include "editmesh.h"
 #include "bmesh_private.h"
@@ -346,7 +353,7 @@ void BME_bmesh_to_editmesh(BME_Mesh *bm, BME_TransData_Head *td, EditMesh *em) {
        
        BME_TransData *vtd;
 
-       EditVert *eve1, *eve2, *eve3, *eve4, **evlist;
+       EditVert *eve1, /* *eve2, *eve3, *eve4, */ /* UNUSED */ **evlist;
        EditEdge *eed;
        EditFace *efa;
 
@@ -403,14 +410,14 @@ void BME_bmesh_to_editmesh(BME_Mesh *bm, BME_TransData_Head *td, EditMesh *em) {
                len = BME_cycle_length(f->loopbase);
                if (len==3 || len==4) {
                        eve1= evlist[f->loopbase->v->tflag1];
-                       eve2= evlist[f->loopbase->next->v->tflag1];
-                       eve3= evlist[f->loopbase->next->next->v->tflag1];
-                       if (len == 4) {
+                       /* eve2= evlist[f->loopbase->next->v->tflag1]; */ /* UNUSED */
+                       /* eve3= evlist[f->loopbase->next->next->v->tflag1]; */ /* UNUSED */
+                       /* if (len == 4) {
                                eve4= evlist[f->loopbase->prev->v->tflag1];
                        }
                        else {
                                eve4= NULL;
-                       }
+                       } */ /* UNUSED */
 
                        efa = NULL; //XXX addfacelist(eve1, eve2, eve3, eve4, NULL, NULL);
                        efa->mat_nr = (unsigned char)f->mat_nr;
@@ -531,7 +538,8 @@ DerivedMesh *BME_bmesh_to_derivedmesh(BME_Mesh *bm, DerivedMesh *dm)
        MFace *mface, *mf;
        MEdge *medge, *me;
        MVert *mvert, *mv;
-       int totface,totedge,totvert,i,bmeshok,len, numTex, numCol;
+       int *origindex;
+       int totface, totedge, totvert, i, /* bmeshok, */ /* UNUSED */ len, numTex, numCol;
 
        BME_Vert *v1=NULL;
        BME_Edge *e=NULL, *oe=NULL;
@@ -559,7 +567,7 @@ DerivedMesh *BME_bmesh_to_derivedmesh(BME_Mesh *bm, DerivedMesh *dm)
        
        /*count quads and tris*/
        totface = 0;
-       bmeshok = 1;
+       /* bmeshok = 1; */ /* UNUSED */
        for(f=bm->polys.first;f;f=f->next){
                len = BME_cycle_length(f->loopbase);
                if(len == 3 || len == 4) totface++;
@@ -577,13 +585,16 @@ DerivedMesh *BME_bmesh_to_derivedmesh(BME_Mesh *bm, DerivedMesh *dm)
 
        /*Make Verts*/
        mvert = CDDM_get_verts(result);
+       origindex = result->getVertDataArray(result, CD_ORIGINDEX);
        for(i=0,v1=bm->verts.first,mv=mvert;v1;v1=v1->next,i++,mv++){
                VECCOPY(mv->co,v1->co);
                mv->flag = (unsigned char)v1->flag;
                mv->bweight = (char)(255.0*v1->bweight);
                CustomData_from_bmesh_block(&bm->vdata, &result->vertData, &v1->data, i);
+               origindex[i] = ORIGINDEX_NONE;
        }
        medge = CDDM_get_edges(result);
+       origindex = result->getEdgeDataArray(result, CD_ORIGINDEX);
        i=0;
        for(e=bm->edges.first,me=medge;e;e=e->next){
                if(e->tflag2){
@@ -600,12 +611,14 @@ DerivedMesh *BME_bmesh_to_derivedmesh(BME_Mesh *bm, DerivedMesh *dm)
                        me->bweight = (char)(255.0*e->bweight);
                        me->flag = e->flag;
                        CustomData_from_bmesh_block(&bm->edata, &result->edgeData, &e->data, i);
+                       origindex[i] = ORIGINDEX_NONE;
                        me++;
                        i++;
                }
        }
        if(totface){
                mface = CDDM_get_faces(result);
+               origindex = result->getFaceDataArray(result, CD_ORIGINDEX);
                /*make faces*/
                for(i=0,f=bm->polys.first;f;f=f->next){
                        mf = &mface[i];
@@ -625,6 +638,7 @@ DerivedMesh *BME_bmesh_to_derivedmesh(BME_Mesh *bm, DerivedMesh *dm)
                                mf->flag = (unsigned char)f->flag;
                                CustomData_from_bmesh_block(&bm->pdata, &result->faceData, &f->data, i);
                                BME_DMloops_to_corners(bm, &result->faceData, i, f,numCol,numTex);
+                               origindex[i] = ORIGINDEX_NONE;
                                i++;
                        }
                }