svn merge ^/trunk/blender -r40872:40890
[blender.git] / source / blender / editors / space_view3d / drawmesh.c
index 76263f5ac3d93e2fadaf73330e912e7d053b5f8e..ae9ef2c4dfdbe4db983d7b8387a35c1c2146938d 100644 (file)
@@ -34,6 +34,7 @@
 
 #include "MEM_guardedalloc.h"
 
+#include "BLI_utildefines.h"
 #include "BLI_blenlib.h"
 #include "BLI_math.h"
 #include "BLI_edgehash.h"
@@ -46,6 +47,7 @@
 #include "DNA_scene_types.h"
 #include "DNA_screen_types.h"
 #include "DNA_view3d_types.h"
+#include "DNA_windowmanager_types.h"
 #include "DNA_object_types.h"
 
 #include "BKE_DerivedMesh.h"
@@ -54,6 +56,7 @@
 #include "BKE_material.h"
 #include "BKE_paint.h"
 #include "BKE_property.h"
+#include "BKE_tessmesh.h"
 
 
 #include "BIF_gl.h"
@@ -421,15 +424,15 @@ static int draw_tface__set_draw(MTFace *tface, int has_mcol, int matnr)
 static void add_tface_color_layer(DerivedMesh *dm)
 {
        MTFace *tface = DM_get_face_data_layer(dm, CD_MTFACE);
-       MFace *mface = DM_get_face_data_layer(dm, CD_MFACE);
+       MFace *mface = dm->getTessFaceArray(dm);
        MCol *finalCol;
        int i,j;
-       MCol *mcol = dm->getFaceDataArray(dm, CD_WEIGHT_MCOL);
+       MCol *mcol = dm->getTessFaceDataArray(dm, CD_WEIGHT_MCOL);
        if(!mcol)
-               mcol = dm->getFaceDataArray(dm, CD_MCOL);
+               mcol = dm->getTessFaceDataArray(dm, CD_MCOL);
 
-       finalCol = MEM_mallocN(sizeof(MCol)*4*dm->getNumFaces(dm),"add_tface_color_layer");
-       for(i=0;i<dm->getNumFaces(dm);i++) {
+       finalCol = MEM_mallocN(sizeof(MCol)*4*dm->getNumTessFaces(dm),"add_tface_color_layer");
+       for(i=0;i<dm->getNumTessFaces(dm);i++) {
                Material *ma= give_current_material(Gtexdraw.ob, mface[i].mat_nr+1);
 
                if (ma && (ma->game.flag&GEMAT_INVISIBLE)) {
@@ -497,28 +500,52 @@ static void add_tface_color_layer(DerivedMesh *dm)
 static int draw_tface_mapped__set_draw(void *userData, int index)
 {
        Mesh *me = (Mesh*)userData;
-       MTFace *tface = (me->mtface)? &me->mtface[index]: NULL;
-       MFace *mface = &me->mface[index];
-       const int matnr = mface->mat_nr;
-       if (mface->flag & ME_HIDE) return 0;
-       return draw_tface__set_draw(tface, (me->mcol != NULL), matnr);
+       MTexPoly *tpoly = (me->mtpoly)? &me->mtpoly[index]: NULL;
+       MPoly *mpoly = (me->mpoly)? &me->mpoly[index]: NULL;
+       MTFace mtf;
+       int matnr = me->mpoly[index].mat_nr;
+
+       if (mpoly && mpoly->flag&ME_HIDE) return 0;
+
+       memset(&mtf, 0, sizeof(mtf));
+       if (tpoly) {
+               mtf.flag = tpoly->flag;
+               mtf.tpage = tpoly->tpage;
+               mtf.transp = tpoly->transp;
+               mtf.mode = tpoly->mode;
+               mtf.tile = tpoly->tile;
+               mtf.unwrap = tpoly->unwrap;
+       }
+
+       return draw_tface__set_draw(&mtf, (me->mcol != NULL), matnr);
 }
 
 static int draw_em_tf_mapped__set_draw(void *userData, int index)
 {
-       struct {EditMesh *em; short has_mcol; short has_mtface;} *data = userData;
-       EditMesh *em = data->em;
-       EditFace *efa= EM_get_face_for_index(index);
-       MTFace *tface;
-       int matnr;
+       struct {BMEditMesh *em; short has_mcol; short has_mtface;} *data = userData;
+       BMEditMesh *em = data->em;
+       BMFace *efa= EDBM_get_face_for_index(em, index);
 
-       if (efa->h)
+       if (efa==NULL || BM_TestHFlag(efa, BM_HIDDEN)) {
                return 0;
+       }
+       else {
+               MTFace mtf= {{{0}}};
+               int matnr = efa->mat_nr;
+
+               if (data->has_mtface) {
+                       MTexPoly *tpoly = CustomData_bmesh_get(&em->bm->pdata, efa->head.data, CD_MTEXPOLY);
+                       mtf.flag = tpoly->flag;
+                       mtf.tpage = tpoly->tpage;
+                       mtf.transp = tpoly->transp;
+                       mtf.mode = tpoly->mode;
+                       mtf.tile = tpoly->tile;
+                       mtf.unwrap = tpoly->unwrap;
 
-       tface = data->has_mtface ? CustomData_em_get(&em->fdata, efa->data, CD_MTFACE) : NULL;
-       matnr = efa->mat_nr;
+               }
 
-       return draw_tface__set_draw_legacy(tface, data->has_mcol, matnr);
+               return draw_tface__set_draw_legacy(&mtf, data->has_mcol, matnr);
+       }
 }
 
 static int wpaint__setSolidDrawOptions(void *userData, int index, int *drawSmooth_r)
@@ -636,11 +663,11 @@ void draw_mesh_textured(Scene *scene, View3D *v3d, RegionView3D *rv3d, Object *o
        glColor4f(1.0f,1.0f,1.0f,1.0f);
 
        if(ob->mode & OB_MODE_EDIT) {
-               struct {EditMesh *em; short has_mcol; short has_mtface;} data;
+               struct {BMEditMesh *em; short has_mcol; short has_mtface;} data;
 
-               data.em= me->edit_mesh;
-               data.has_mcol= CustomData_has_layer(&me->edit_mesh->fdata, CD_MCOL);
-               data.has_mtface= CustomData_has_layer(&me->edit_mesh->fdata, CD_MTFACE);
+               data.em= me->edit_btmesh;
+               data.has_mcol= CustomData_has_layer(&me->edit_btmesh->bm->ldata, CD_MLOOPCOL);
+               data.has_mtface= CustomData_has_layer(&me->edit_btmesh->bm->pdata, CD_MTEXPOLY);
 
                dm->drawMappedFacesTex(dm, draw_em_tf_mapped__set_draw, &data);
        }