Revision: 41713
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=41713
Author: campbellbarton
Date: 2011-11-10 03:40:02 +0000 (Thu, 10 Nov 2011)
Log Message:
-----------
fix compile errors for previous merge
Modified Paths:
--------------
branches/bmesh/blender/source/blender/blenkernel/intern/cdderivedmesh.c
branches/bmesh/blender/source/blender/blenkernel/intern/editderivedbmesh.c
branches/bmesh/blender/source/blender/editors/space_image/space_image.c
branches/bmesh/blender/source/blender/editors/space_view3d/drawmesh.c
branches/bmesh/blender/source/blender/editors/uvedit/uvedit_ops.c
Modified:
branches/bmesh/blender/source/blender/blenkernel/intern/cdderivedmesh.c
===================================================================
--- branches/bmesh/blender/source/blender/blenkernel/intern/cdderivedmesh.c
2011-11-10 03:05:11 UTC (rev 41712)
+++ branches/bmesh/blender/source/blender/blenkernel/intern/cdderivedmesh.c
2011-11-10 03:40:02 UTC (rev 41713)
@@ -1397,9 +1397,9 @@
DMVertexAttribs attribs;
MVert *mvert = cddm->mvert;
MFace *mf = cddm->mface;
- float (*nors)[3] = dm->getFaceDataArray(dm, CD_NORMAL);
+ float (*nors)[3] = dm->getTessFaceDataArray(dm, CD_NORMAL);
int a, matnr, new_matnr;
- int orig, *index = dm->getFaceDataArray(dm, CD_ORIGINDEX);
+ int orig, *index = dm->getTessFaceDataArray(dm, CD_ORIGINDEX);
cdDM_update_normals_from_pbvh(dm);
Modified:
branches/bmesh/blender/source/blender/blenkernel/intern/editderivedbmesh.c
===================================================================
--- branches/bmesh/blender/source/blender/blenkernel/intern/editderivedbmesh.c
2011-11-10 03:05:11 UTC (rev 41712)
+++ branches/bmesh/blender/source/blender/blenkernel/intern/editderivedbmesh.c
2011-11-10 03:40:02 UTC (rev 41713)
@@ -1112,6 +1112,7 @@
glEnd();
}
}
+#undef PASSATTRIB
}
static void bmDM_drawFacesGLSL(DerivedMesh *dm,
@@ -1126,43 +1127,41 @@
int (*setFace)(void *userData, int index), void
*userData)
{
EditDerivedBMesh *bmdm= (EditDerivedBMesh*) dm;
- EditMesh *em= bmdm->em;
+ BMesh *bm= bmdm->tc->bm;
+ BMEditMesh *em = bmdm->tc;
float (*vertexCos)[3]= bmdm->vertexCos;
float (*vertexNos)[3]= bmdm->vertexNos;
- EditVert *eve;
- EditFace *efa;
+ BMVert *eve;
+ BMFace *efa;
+ BMIter iter;
+ BMLoop **ltri;
DMVertexAttribs attribs= {{{0}}};
GPUVertexAttribs gattribs;
- int i, b, matnr, new_matnr;
+ int i, b, matnr, new_matnr, dodraw;
matnr = -1;
/* always use smooth shading even for flat faces, else vertex colors
wont interpolate */
glShadeModel(GL_SMOOTH);
- for (i=0,eve=em->verts.first; eve; eve= eve->next)
- eve->tmp.l = (intptr_t) i++;
+ BM_ITER_INDEX(eve, &iter, bm, BM_VERTS_OF_MESH, NULL, i) {
+ BM_SetIndex(eve, i);
+ }
-#define PASSATTRIB(efa, eve, vert) {
\
+#define PASSATTRIB(loop, eve, vert) {
\
if(attribs.totorco) {
\
- float *orco = attribs.orco.array[eve->tmp.l];
\
- if(attribs.orco.glTexco)
\
- glTexCoord3fv(orco);
\
- else
\
- glVertexAttrib3fvARB(attribs.orco.glIndex, orco);
\
+ float *orco = attribs.orco.array[BM_GetIndex(eve)];
\
+ glVertexAttrib3fvARB(attribs.orco.glIndex, orco);
\
}
\
for(b = 0; b < attribs.tottface; b++) {
\
- MTFace *_tf = (MTFace*)((char*)efa->data +
attribs.tface[b].emOffset); \
- if(attribs.tface[b].glTexco)
\
- glTexCoord2fv(_tf->uv[vert]);
\
- else
\
- glVertexAttrib2fvARB(attribs.tface[b].glIndex,
_tf->uv[vert]); \
+ MLoopUV *_luv = CustomData_bmesh_get_n(&bm->ldata,
loop->head.data, CD_MLOOPUV, b);\
+ glVertexAttrib2fvARB(attribs.tface[b].glIndex, _luv->uv);
\
}
\
for(b = 0; b < attribs.totmcol; b++) {
\
- MCol *cp = (MCol*)((char*)efa->data +
attribs.mcol[b].emOffset); \
- GLubyte col[4];
\
- col[0]= cp->b; col[1]= cp->g; col[2]= cp->r; col[3]= cp->a;
\
- glVertexAttrib4ubvARB(attribs.mcol[b].glIndex, col);
\
+ MLoopCol *_cp = CustomData_bmesh_get_n(&bm->ldata,
loop->head.data, CD_MLOOPCOL, b);\
+ GLubyte _col[4];
\
+ _col[0]= _cp->b; _col[1]= _cp->g; _col[2]= _cp->r; _col[3]=
_cp->a; \
+ glVertexAttrib4ubvARB(attribs.mcol[b].glIndex, _col);
\
}
\
if(attribs.tottang) {
\
float *tang = attribs.tang.array[i*4 + vert];
\
@@ -1170,11 +1169,13 @@
}
\
}
- for (i=0,efa= em->faces.first; efa; i++,efa= efa->next) {
- int drawSmooth= (efa->flag & ME_SMOOTH);
+ for (i=0, ltri=em->looptris[0]; i<em->tottri; i++, ltri += 3) {
+ int drawSmooth= BM_TestHFlag(efa, BM_SMOOTH);
+ efa = ltri[0]->f;
+
/* face hiding */
- if(setFace && !setFace(userData, i))
+ if(setFace && !setFace(userData, BM_GetIndex(efa)))
continue;
/* material */
@@ -1185,70 +1186,53 @@
}
/* face */
- glBegin(efa->v4?GL_QUADS:GL_TRIANGLES);
+ glBegin(GL_TRIANGLES);
if (!drawSmooth) {
if(vertexCos) glNormal3fv(bmdm->faceNos[i]);
- else glNormal3fv(efa->n);
+ else glNormal3fv(efa->no);
- PASSATTRIB(efa, efa->v1, 0);
- if(vertexCos) glVertex3fv(vertexCos[(int)
efa->v1->tmp.l]);
- else glVertex3fv(efa->v1->co);
+ PASSATTRIB(ltri[0], ltri[0]->v, 0);
+ if(vertexCos)
glVertex3fv(vertexCos[BM_GetIndex(ltri[0]->v)]);
+ else glVertex3fv(ltri[0]->v->co);
- PASSATTRIB(efa, efa->v2, 1);
- if(vertexCos) glVertex3fv(vertexCos[(int)
efa->v2->tmp.l]);
- else glVertex3fv(efa->v2->co);
+ PASSATTRIB(ltri[1], ltri[1]->v, 1);
+ if(vertexCos)
glVertex3fv(vertexCos[BM_GetIndex(ltri[1]->v)]);
+ else glVertex3fv(ltri[1]->v->co);
- PASSATTRIB(efa, efa->v3, 2);
- if(vertexCos) glVertex3fv(vertexCos[(int)
efa->v3->tmp.l]);
- else glVertex3fv(efa->v3->co);
+ PASSATTRIB(ltri[2], ltri[2]->v, 2);
+ if(vertexCos)
glVertex3fv(vertexCos[BM_GetIndex(ltri[2]->v)]);
+ else glVertex3fv(ltri[2]->v->co);
- if(efa->v4) {
- PASSATTRIB(efa, efa->v4, 3);
- if(vertexCos) glVertex3fv(vertexCos[(int)
efa->v4->tmp.l]);
- else glVertex3fv(efa->v4->co);
- }
} else {
- PASSATTRIB(efa, efa->v1, 0);
+ PASSATTRIB(ltri[0], ltri[0]->v, 0);
if(vertexCos) {
- glNormal3fv(vertexNos[(int) efa->v1->tmp.l]);
- glVertex3fv(vertexCos[(int) efa->v1->tmp.l]);
+ glNormal3fv(vertexNos[BM_GetIndex(ltri[0]->v)]);
+ glVertex3fv(vertexCos[BM_GetIndex(ltri[0]->v)]);
}
else {
- glNormal3fv(efa->v1->no);
- glVertex3fv(efa->v1->co);
+ glNormal3fv(ltri[0]->v->no);
+ glVertex3fv(ltri[0]->v->co);
}
- PASSATTRIB(efa, efa->v2, 1);
+ PASSATTRIB(ltri[1], ltri[1]->v, 1);
if(vertexCos) {
- glNormal3fv(vertexNos[(int) efa->v2->tmp.l]);
- glVertex3fv(vertexCos[(int) efa->v2->tmp.l]);
+ glNormal3fv(vertexNos[BM_GetIndex(ltri[1]->v)]);
+ glVertex3fv(vertexCos[BM_GetIndex(ltri[1]->v)]);
}
else {
- glNormal3fv(efa->v2->no);
- glVertex3fv(efa->v2->co);
+ glNormal3fv(ltri[1]->v->no);
+ glVertex3fv(ltri[1]->v->co);
}
- PASSATTRIB(efa, efa->v3, 2);
+ PASSATTRIB(ltri[2], ltri[2]->v, 2);
if(vertexCos) {
- glNormal3fv(vertexNos[(int) efa->v3->tmp.l]);
- glVertex3fv(vertexCos[(int) efa->v3->tmp.l]);
+ glNormal3fv(vertexNos[BM_GetIndex(ltri[2]->v)]);
+ glVertex3fv(vertexCos[BM_GetIndex(ltri[2]->v)]);
}
else {
- glNormal3fv(efa->v3->no);
- glVertex3fv(efa->v3->co);
+ glNormal3fv(ltri[2]->v->no);
+ glVertex3fv(ltri[2]->v->co);
}
-
- if(efa->v4) {
- PASSATTRIB(efa, efa->v4, 3);
- if(vertexCos) {
- glNormal3fv(vertexNos[(int)
efa->v4->tmp.l]);
- glVertex3fv(vertexCos[(int)
efa->v4->tmp.l]);
- }
- else {
- glNormal3fv(efa->v4->no);
- glVertex3fv(efa->v4->co);
- }
- }
}
glEnd();
}
Modified:
branches/bmesh/blender/source/blender/editors/space_image/space_image.c
===================================================================
--- branches/bmesh/blender/source/blender/editors/space_image/space_image.c
2011-11-10 03:05:11 UTC (rev 41712)
+++ branches/bmesh/blender/source/blender/editors/space_image/space_image.c
2011-11-10 03:40:02 UTC (rev 41713)
@@ -52,6 +52,7 @@
#include "BKE_mesh.h"
#include "BKE_scene.h"
#include "BKE_screen.h"
+#include "BKE_tessmesh.h"
#include "IMB_imbuf_types.h"
Modified: branches/bmesh/blender/source/blender/editors/space_view3d/drawmesh.c
===================================================================
--- branches/bmesh/blender/source/blender/editors/space_view3d/drawmesh.c
2011-11-10 03:05:11 UTC (rev 41712)
+++ branches/bmesh/blender/source/blender/editors/space_view3d/drawmesh.c
2011-11-10 03:40:02 UTC (rev 41713)
@@ -797,12 +797,14 @@
return !(mface->flag & ME_HIDE);
}
-static int tex_mat_set_face_editmesh_cb(void *UNUSED(userData), int index)
+static int tex_mat_set_face_editmesh_cb(void *userData, int index)
{
/* editmode face hiding */
- EditFace *efa= EM_get_face_for_index(index);
+ TexMatCallback *data= (TexMatCallback*)userData;
+ Mesh *me = (Mesh*)data->me;
+ BMFace *efa= EDBM_get_face_for_index(me->edit_btmesh, index);
- return !(efa->h);
+ return !BM_TestHFlag(efa, BM_HIDDEN);
}
void draw_mesh_textured(Scene *scene, View3D *v3d, RegionView3D *rv3d, Object
*ob, DerivedMesh *dm, int faceselect)
Modified: branches/bmesh/blender/source/blender/editors/uvedit/uvedit_ops.c
===================================================================
--- branches/bmesh/blender/source/blender/editors/uvedit/uvedit_ops.c
2011-11-10 03:05:11 UTC (rev 41712)
+++ branches/bmesh/blender/source/blender/editors/uvedit/uvedit_ops.c
2011-11-10 03:40:02 UTC (rev 41713)
@@ -59,7 +59,9 @@
#include "BKE_main.h"
#include "BKE_material.h"
#include "BKE_mesh.h"
+#include "BKE_node.h"
#include "BKE_report.h"
+#include "BKE_scene.h"
#include "BKE_tessmesh.h"
#include "ED_image.h"
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
