Merged changes in the trunk up to revision 52191.

[blender-staging.git] / source / blender / bmesh / intern / bmesh_construct.c

diff --git a/source/blender/bmesh/intern/bmesh_construct.c b/source/blender/bmesh/intern/bmesh_construct.c
index 81405079a56df24b184213d8468873e202df96e4..5dd090c523de6678d2fe23a43554c58c9ad8c796 100644 (file)
--- a/source/blender/bmesh/intern/bmesh_construct.c
+++ b/source/blender/bmesh/intern/bmesh_construct.c
@@ -982,14 +982,16 @@ char BM_edge_flag_from_mflag(const short meflag)
                 ((meflag & ME_SEAM)       ? BM_ELEM_SEAM   : 0) |
                 ((meflag & ME_EDGEDRAW)   ? BM_ELEM_DRAW   : 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)
                 );
 }
 
@@ -1012,6 +1014,7 @@ short BM_edge_flag_to_mflag(BMEdge *eed)
                 ((hflag & BM_ELEM_DRAW)         ? ME_EDGEDRAW  : 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_EDGERENDER
                 );
@@ -1022,6 +1025,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)
                 );
 }