diff options
| -rw-r--r-- | source/blender/blenloader/intern/readfile.c | 2 | ||||
| -rw-r--r-- | source/blender/bmesh/intern/bmesh_mesh_conv.c | 31 | ||||
| -rw-r--r-- | source/blender/makesdna/DNA_mesh_types.h | 2 |
3 files changed, 0 insertions, 35 deletions
diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c index b727aae64dd..6716fbe2ed5 100644 --- a/source/blender/blenloader/intern/readfile.c +++ b/source/blender/blenloader/intern/readfile.c @@ -9358,7 +9358,6 @@ static void do_versions(FileData *fd, Library *lib, Main *main) medge++; fed++; } - me->cd_flag |= ME_CDFLAG_FREESTYLE_EDGE; printf("Migrated to CustomData-based Freestyle edge marks\n"); } /* Freestyle face marks */ @@ -9382,7 +9381,6 @@ static void do_versions(FileData *fd, Library *lib, Main *main) mpoly++; ffa++; } - me->cd_flag |= ME_CDFLAG_FREESTYLE_FACE; printf("Migrated to CustomData-based Freestyle face marks\n"); } } diff --git a/source/blender/bmesh/intern/bmesh_mesh_conv.c b/source/blender/bmesh/intern/bmesh_mesh_conv.c index c68bb2cd20c..27e4a8df2a7 100644 --- a/source/blender/bmesh/intern/bmesh_mesh_conv.c +++ b/source/blender/bmesh/intern/bmesh_mesh_conv.c @@ -146,29 +146,6 @@ void BM_mesh_cd_flag_apply(BMesh *bm, const char cd_flag) BM_data_layer_free(bm, &bm->edata, CD_CREASE); } } -#ifdef WITH_FREESTYLE - if (cd_flag & ME_CDFLAG_FREESTYLE_EDGE) { - if (!CustomData_has_layer(&bm->edata, CD_FREESTYLE_EDGE)) { - BM_data_layer_add(bm, &bm->edata, CD_FREESTYLE_EDGE); - } - } - else { - if (CustomData_has_layer(&bm->edata, CD_FREESTYLE_EDGE)) { - BM_data_layer_free(bm, &bm->edata, CD_FREESTYLE_EDGE); - } - } - - if (cd_flag & ME_CDFLAG_FREESTYLE_FACE) { - if (!CustomData_has_layer(&bm->pdata, CD_FREESTYLE_FACE)) { - BM_data_layer_add(bm, &bm->pdata, CD_FREESTYLE_FACE); - } - } - else { - if (CustomData_has_layer(&bm->pdata, CD_FREESTYLE_FACE)) { - BM_data_layer_free(bm, &bm->pdata, CD_FREESTYLE_FACE); - } - } -#endif } char BM_mesh_cd_flag_from_bmesh(BMesh *bm) @@ -183,14 +160,6 @@ char BM_mesh_cd_flag_from_bmesh(BMesh *bm) if (CustomData_has_layer(&bm->edata, CD_CREASE)) { cd_flag |= ME_CDFLAG_EDGE_CREASE; } -#ifdef WITH_FREESTYLE - if (CustomData_has_layer(&bm->edata, CD_FREESTYLE_EDGE)) { - cd_flag |= ME_CDFLAG_FREESTYLE_EDGE; - } - if (CustomData_has_layer(&bm->pdata, CD_FREESTYLE_FACE)) { - cd_flag |= ME_CDFLAG_FREESTYLE_FACE; - } -#endif return cd_flag; } diff --git a/source/blender/makesdna/DNA_mesh_types.h b/source/blender/makesdna/DNA_mesh_types.h index 85bb58a2017..7cb24b53680 100644 --- a/source/blender/makesdna/DNA_mesh_types.h +++ b/source/blender/makesdna/DNA_mesh_types.h @@ -179,8 +179,6 @@ typedef struct TFace { #define ME_CDFLAG_VERT_BWEIGHT (1 << 0) #define ME_CDFLAG_EDGE_BWEIGHT (1 << 1) #define ME_CDFLAG_EDGE_CREASE (1 << 2) -#define ME_CDFLAG_FREESTYLE_EDGE (1 << 3) -#define ME_CDFLAG_FREESTYLE_FACE (1 << 4) /* me->drawflag, short */ #define ME_DRAWEDGES (1 << 0) |