diff options
| author | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2013-03-31 14:33:27 +0400 |
|---|---|---|
| committer | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2013-03-31 14:33:27 +0400 |
| commit | 1360bb6fb0bf0c5c14235c47bf1399accbcecc6f (patch) | |
| tree | d7c54ffecd745f9f390e8b4e9283843a8fa704ef /source/blender/blenkernel/intern/subsurf_ccg.c | |
| parent | 829a2cc1b0495a70ca8333f29023bc2414a465f8 (diff) | |
Work-in-progress re-implementation of CustomData-based edge/face marks.
Most changes in revision 55228 were reverted and Freestyle edge/face marks
were re-implemented using CD_ORIGINDEX layers of edge/poly custom data.
For this implementation to work properly, modifiers were updated so that
required CD_ORIGINDEX layers will be set. As pilot cases, the Mirror and
Solidify modifiers were updated (see comments in the code).
Some Freestyle-specific code is necessary in DerivedMesh.c so that the
CD_FREESTYLE_EDGE/FACE layers will be transferred from meshes to derived
meshes. This seems unnecessary, so further investigation is foreseen.
Diffstat (limited to 'source/blender/blenkernel/intern/subsurf_ccg.c')
| -rw-r--r-- | source/blender/blenkernel/intern/subsurf_ccg.c | 31 |
1 files changed, 0 insertions, 31 deletions
diff --git a/source/blender/blenkernel/intern/subsurf_ccg.c b/source/blender/blenkernel/intern/subsurf_ccg.c index d3ffde33f0d..025ea909e05 100644 --- a/source/blender/blenkernel/intern/subsurf_ccg.c +++ b/source/blender/blenkernel/intern/subsurf_ccg.c @@ -3108,10 +3108,6 @@ static CCGDerivedMesh *getCCGDerivedMesh(CCGSubSurf *ss, MEdge *medge = NULL; /* MFace *mface = NULL; */ MPoly *mpoly = NULL; -#ifdef WITH_FREESTYLE - FreestyleEdge *fed = NULL, *ccgdm_fed = NULL; - FreestyleFace *ffa = NULL, *ccgdm_ffa = NULL; -#endif DM_from_template(&ccgdm->dm, dm, DM_TYPE_CCGDM, ccgSubSurf_getNumFinalVerts(ss), @@ -3286,19 +3282,6 @@ static CCGDerivedMesh *getCCGDerivedMesh(CCGSubSurf *ss, has_edge_origindex = CustomData_has_layer(&ccgdm->dm.edgeData, CD_ORIGINDEX); -#ifdef WITH_FREESTYLE - fed = DM_get_edge_data_layer(dm, CD_FREESTYLE_EDGE); - if (fed) { - ccgdm_fed = CustomData_add_layer(&ccgdm->dm.edgeData, CD_FREESTYLE_EDGE, CD_CALLOC, NULL, - ccgSubSurf_getNumFinalEdges(ss)); - } - ffa = DM_get_poly_data_layer(dm, CD_FREESTYLE_FACE); - if (ffa) { - ccgdm_ffa = CustomData_add_layer(&ccgdm->dm.faceData, CD_FREESTYLE_FACE, CD_CALLOC, NULL, - ccgSubSurf_getNumFinalFaces(ss)); - } -#endif - loopindex = loopindex2 = 0; /* current loop index */ for (index = 0; index < totface; index++) { CCGFace *f = ccgdm->faceMap[index].face; @@ -3435,12 +3418,6 @@ static CCGDerivedMesh *getCCGDerivedMesh(CCGSubSurf *ss, /* This is a simple one to one mapping, here... */ polyidx[faceNum] = faceNum; -#ifdef WITH_FREESTYLE - if (ffa && ffa[index].flag & FREESTYLE_FACE_MARK) { - ccgdm_ffa[faceNum].flag |= FREESTYLE_FACE_MARK; - } -#endif - faceNum++; } } @@ -3490,14 +3467,6 @@ static CCGDerivedMesh *getCCGDerivedMesh(CCGSubSurf *ss, } } -#ifdef WITH_FREESTYLE - if (fed && fed[index].flag & FREESTYLE_EDGE_MARK) { - for (i = 0; i < numFinalEdges; ++i) { - ccgdm_fed[edgeNum + i].flag |= FREESTYLE_EDGE_MARK; - } - } -#endif - edgeNum += numFinalEdges; } |