griefith/test
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Removed ME_CDFLAG_FREESTYLE_EDGE and ME_CDFLAG_FREESTYLE_FACE from Mesh::cd_flag.

Browse Source 
Suggested by Campbell Barton through a review comment of the Freestyle branch.
This commit is contained in:
Tamito Kajiyama
2013-04-01 18:32:19 +00:00
parent 5524ed9ba2
commit eec0d2ee53
3 changed files with 0 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
source/blender/blenloader/intern/readfile.c
View File

@@ -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");
}
}

31
source/blender/bmesh/intern/bmesh_mesh_conv.c
View File

@@ -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;
}

2
source/blender/makesdna/DNA_mesh_types.h
View File

@@ -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)