[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [43980] branches/bmesh/blender/source/ blender: Code Cleanup:
Campbell Barton
ideasman42 at gmail.com
Wed Feb 8 10:02:17 CET 2012
Revision: 43980
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=43980
Author: campbellbarton
Date: 2012-02-08 09:02:10 +0000 (Wed, 08 Feb 2012)
Log Message:
-----------
Code Cleanup:
macro for copying polygon settings
Modified Paths:
--------------
branches/bmesh/blender/source/blender/blenkernel/intern/cdderivedmesh.c
branches/bmesh/blender/source/blender/blenkernel/intern/editderivedmesh.c
branches/bmesh/blender/source/blender/blenkernel/intern/mesh.c
branches/bmesh/blender/source/blender/blenkernel/intern/subsurf_ccg.c
branches/bmesh/blender/source/blender/bmesh/intern/bmesh_interp.c
branches/bmesh/blender/source/blender/editors/space_view3d/drawmesh.c
branches/bmesh/blender/source/blender/makesdna/DNA_meshdata_types.h
Modified: branches/bmesh/blender/source/blender/blenkernel/intern/cdderivedmesh.c
===================================================================
--- branches/bmesh/blender/source/blender/blenkernel/intern/cdderivedmesh.c 2012-02-08 07:20:49 UTC (rev 43979)
+++ branches/bmesh/blender/source/blender/blenkernel/intern/cdderivedmesh.c 2012-02-08 09:02:10 UTC (rev 43980)
@@ -1949,12 +1949,7 @@
texface = CustomData_get_n(facedata, CD_MTFACE, cdindex, i);
texpoly = CustomData_bmesh_get_n(&bm->pdata, f->head.data, CD_MTEXPOLY, i);
- texface->tpage = texpoly->tpage;
- texface->flag = texpoly->flag;
- texface->transp = texpoly->transp;
- texface->mode = texpoly->mode;
- texface->tile = texpoly->tile;
- texface->unwrap = texpoly->unwrap;
+ ME_MTEXFACE_CPY(texface, texpoly);
for (j=0; j<3; j++) {
l = l3[j];
Modified: branches/bmesh/blender/source/blender/blenkernel/intern/editderivedmesh.c
===================================================================
--- branches/bmesh/blender/source/blender/blenkernel/intern/editderivedmesh.c 2012-02-08 07:20:49 UTC (rev 43979)
+++ branches/bmesh/blender/source/blender/blenkernel/intern/editderivedmesh.c 2012-02-08 09:02:10 UTC (rev 43980)
@@ -877,12 +877,7 @@
efa = ls[0]->f;
if (has_uv) {
- mtf.flag = tp->flag;
- mtf.tpage = tp->tpage;
- mtf.transp = tp->transp;
- mtf.mode = tp->mode;
- mtf.tile = tp->tile;
- mtf.unwrap = tp->unwrap;
+ ME_MTEXFACE_CPY(&mtf, tp);
}
if (drawParams)
@@ -952,12 +947,7 @@
efa = ls[0]->f;
if (has_uv) {
- mtf.flag = tp->flag;
- mtf.tpage = tp->tpage;
- mtf.transp = tp->transp;
- mtf.mode = tp->mode;
- mtf.tile = tp->tile;
- mtf.unwrap = tp->unwrap;
+ ME_MTEXFACE_CPY(&mtf, tp);
}
if (drawParams)
Modified: branches/bmesh/blender/source/blender/blenkernel/intern/mesh.c
===================================================================
--- branches/bmesh/blender/source/blender/blenkernel/intern/mesh.c 2012-02-08 07:20:49 UTC (rev 43979)
+++ branches/bmesh/blender/source/blender/blenkernel/intern/mesh.c 2012-02-08 09:02:10 UTC (rev 43980)
@@ -1846,12 +1846,7 @@
texface = CustomData_get_n(&me->fdata, CD_MTFACE, findex, i);
texpoly = CustomData_get_n(&me->pdata, CD_MTEXPOLY, findex, i);
- texpoly->tpage = texface->tpage;
- texpoly->flag = texface->flag;
- texpoly->transp = texface->transp;
- texpoly->mode = texface->mode;
- texpoly->tile = texface->tile;
- texpoly->unwrap = texface->unwrap;
+ ME_MTEXFACE_CPY(texpoly, texface);
mloopuv = CustomData_get_n(&me->ldata, CD_MLOOPUV, loopstart, i);
copy_v2_v2(mloopuv->uv, texface->uv[0]); mloopuv++;
@@ -2194,14 +2189,9 @@
for(i=0; i < numTex; i++){
texface = CustomData_get_n(fdata, CD_MTFACE, findex, i);
texpoly = CustomData_get_n(pdata, CD_MTEXPOLY, polyindex, i);
-
- texface->tpage = texpoly->tpage;
- texface->flag = texpoly->flag;
- texface->transp = texpoly->transp;
- texface->mode = texpoly->mode;
- texface->tile = texpoly->tile;
- texface->unwrap = texpoly->unwrap;
+ ME_MTEXFACE_CPY(texface, texpoly);
+
for (j=0; j < mf_len; j++) {
mloopuv = CustomData_get_n(ldata, CD_MLOOPUV, lindex[j], i);
copy_v2_v2(texface->uv[j], mloopuv->uv);
Modified: branches/bmesh/blender/source/blender/blenkernel/intern/subsurf_ccg.c
===================================================================
--- branches/bmesh/blender/source/blender/blenkernel/intern/subsurf_ccg.c 2012-02-08 07:20:49 UTC (rev 43979)
+++ branches/bmesh/blender/source/blender/blenkernel/intern/subsurf_ccg.c 2012-02-08 09:02:10 UTC (rev 43980)
@@ -2402,12 +2402,7 @@
texface = CustomData_get_n(fdata, CD_MTFACE, findex, i);
texpoly = CustomData_get_n(pdata, CD_MTEXPOLY, polyindex, i);
- texface->tpage = texpoly->tpage;
- texface->flag = texpoly->flag;
- texface->transp = texpoly->transp;
- texface->mode = texpoly->mode;
- texface->tile = texpoly->tile;
- texface->unwrap = texpoly->unwrap;
+ ME_MTEXFACE_CPY(texface, texpoly);
mloopuv = CustomData_get_n(ldata, CD_MLOOPUV, loopstart, i);
for (j=0; j<4; j++, mloopuv++) {
Modified: branches/bmesh/blender/source/blender/bmesh/intern/bmesh_interp.c
===================================================================
--- branches/bmesh/blender/source/blender/bmesh/intern/bmesh_interp.c 2012-02-08 07:20:49 UTC (rev 43979)
+++ branches/bmesh/blender/source/blender/bmesh/intern/bmesh_interp.c 2012-02-08 09:02:10 UTC (rev 43980)
@@ -159,12 +159,7 @@
texface = CustomData_get_n(&me->fdata, CD_MTFACE, findex, i);
texpoly = CustomData_bmesh_get_n(&bm->pdata, f->head.data, CD_MTEXPOLY, i);
- texface->tpage = texpoly->tpage;
- texface->flag = texpoly->flag;
- texface->transp = texpoly->transp;
- texface->mode = texpoly->mode;
- texface->tile = texpoly->tile;
- texface->unwrap = texpoly->unwrap;
+ ME_MTEXFACE_CPY(texface, texpoly);
j = 0;
BM_ITER(l, &iter, bm, BM_LOOPS_OF_FACE, f) {
Modified: branches/bmesh/blender/source/blender/editors/space_view3d/drawmesh.c
===================================================================
--- branches/bmesh/blender/source/blender/editors/space_view3d/drawmesh.c 2012-02-08 07:20:49 UTC (rev 43979)
+++ branches/bmesh/blender/source/blender/editors/space_view3d/drawmesh.c 2012-02-08 09:02:10 UTC (rev 43980)
@@ -532,12 +532,7 @@
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;
+ ME_MTEXFACE_CPY(&mtf, tpoly);
}
return draw_tface__set_draw(&mtf, (me->mcol != NULL), matnr);
@@ -558,13 +553,7 @@
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;
-
+ ME_MTEXFACE_CPY(&mtf, tpoly);
}
return draw_tface__set_draw_legacy(&mtf, data->has_mcol, matnr);
Modified: branches/bmesh/blender/source/blender/makesdna/DNA_meshdata_types.h
===================================================================
--- branches/bmesh/blender/source/blender/makesdna/DNA_meshdata_types.h 2012-02-08 07:20:49 UTC (rev 43979)
+++ branches/bmesh/blender/source/blender/makesdna/DNA_meshdata_types.h 2012-02-08 09:02:10 UTC (rev 43980)
@@ -98,6 +98,17 @@
short mode,tile,unwrap;
} MTexPoly;
+/* can copy from/to MTexPoly/MTFace */
+#define ME_MTEXFACE_CPY(dst, src) \
+{ \
+ (dst)->tpage = (src)->tpage; \
+ (dst)->flag = (src)->flag; \
+ (dst)->transp = (src)->transp; \
+ (dst)->mode = (src)->mode; \
+ (dst)->tile = (src)->tile; \
+ (dst)->unwrap = (src)->unwrap; \
+}
+
typedef struct MLoopUV {
float uv[2];
int flag;
More information about the Bf-blender-cvs
mailing list