From eec0d2ee535825daa323886ed11970adc102a130 Mon Sep 17 00:00:00 2001 From: Tamito Kajiyama Date: Mon, 1 Apr 2013 18:32:19 +0000 Subject: Removed ME_CDFLAG_FREESTYLE_EDGE and ME_CDFLAG_FREESTYLE_FACE from Mesh::cd_flag. Suggested by Campbell Barton through a review comment of the Freestyle branch. --- source/blender/bmesh/intern/bmesh_mesh_conv.c | 31 --------------------------- 1 file changed, 31 deletions(-) (limited to 'source/blender/bmesh/intern/bmesh_mesh_conv.c') 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; } -- cgit v1.2.3