diff options
Diffstat (limited to 'source/blender/bmesh/intern')
| -rw-r--r-- | source/blender/bmesh/intern/bmesh_construct.c | 10 | ||||
| -rw-r--r-- | source/blender/bmesh/intern/bmesh_operators.h | 6 |
2 files changed, 11 insertions, 5 deletions
diff --git a/source/blender/bmesh/intern/bmesh_construct.c b/source/blender/bmesh/intern/bmesh_construct.c index 684237b79c5..38e9e6ffd53 100644 --- a/source/blender/bmesh/intern/bmesh_construct.c +++ b/source/blender/bmesh/intern/bmesh_construct.c @@ -974,14 +974,16 @@ char BM_edge_flag_from_mflag(const short meflag) return ( ((meflag & SELECT) ? BM_ELEM_SELECT : 0) | ((meflag & ME_SEAM) ? BM_ELEM_SEAM : 0) | ((meflag & ME_SHARP) == 0 ? BM_ELEM_SMOOTH : 0) | /* invert */ - ((meflag & ME_HIDE) ? BM_ELEM_HIDDEN : 0) + ((meflag & ME_HIDE) ? BM_ELEM_HIDDEN : 0) | + ((meflag & ME_FREESTYLE_EDGE) ? BM_ELEM_FREESTYLE : 0) ); } char BM_face_flag_from_mflag(const char meflag) { return ( ((meflag & ME_FACE_SEL) ? BM_ELEM_SELECT : 0) | ((meflag & ME_SMOOTH) ? BM_ELEM_SMOOTH : 0) | - ((meflag & ME_HIDE) ? BM_ELEM_HIDDEN : 0) + ((meflag & ME_HIDE) ? BM_ELEM_HIDDEN : 0) | + ((meflag & ME_FREESTYLE_FACE) ? BM_ELEM_FREESTYLE : 0) ); } @@ -1002,6 +1004,7 @@ short BM_edge_flag_to_mflag(BMEdge *eed) ((hflag & BM_ELEM_SEAM) ? ME_SEAM : 0) | ((hflag & BM_ELEM_SMOOTH) == 0 ? ME_SHARP : 0) | ((hflag & BM_ELEM_HIDDEN) ? ME_HIDE : 0) | + ((hflag & BM_ELEM_FREESTYLE) ? ME_FREESTYLE_EDGE : 0) | ((BM_edge_is_wire(eed)) ? ME_LOOSEEDGE : 0) | /* not typical */ (ME_EDGEDRAW | ME_EDGERENDER) ); @@ -1012,6 +1015,7 @@ char BM_face_flag_to_mflag(BMFace *efa) return ( ((hflag & BM_ELEM_SELECT) ? ME_FACE_SEL : 0) | ((hflag & BM_ELEM_SMOOTH) ? ME_SMOOTH : 0) | - ((hflag & BM_ELEM_HIDDEN) ? ME_HIDE : 0) + ((hflag & BM_ELEM_HIDDEN) ? ME_HIDE : 0) | + ((hflag & BM_ELEM_FREESTYLE) ? ME_FREESTYLE_FACE : 0) ); } diff --git a/source/blender/bmesh/intern/bmesh_operators.h b/source/blender/bmesh/intern/bmesh_operators.h index b0a647b7009..3a63b77c50f 100644 --- a/source/blender/bmesh/intern/bmesh_operators.h +++ b/source/blender/bmesh/intern/bmesh_operators.h @@ -53,7 +53,8 @@ enum { SIMFACE_AREA, SIMFACE_PERIMETER, SIMFACE_NORMAL, - SIMFACE_COPLANAR + SIMFACE_COPLANAR, + SIMFACE_FREESTYLE }; /* similar edge selection slot values */ @@ -64,7 +65,8 @@ enum { SIMEDGE_FACE_ANGLE, SIMEDGE_CREASE, SIMEDGE_SEAM, - SIMEDGE_SHARP + SIMEDGE_SHARP, + SIMEDGE_FREESTYLE }; /* similar vertex selection slot values */ |