Merged changes in the trunk up to revision 41225.
[blender-staging.git] / source / blender / blenkernel / intern / BME_conversions.c
index 8b5cfe1b882a48dd51f0a42eed8862f5ab15f5ed..cd0af6d58f0fe5e83a2338bbdb9023b651e636d7 100644 (file)
@@ -304,6 +304,7 @@ BME_Mesh *BME_editmesh_to_bmesh(EditMesh *em) {
                e->flag = eed->f & SELECT;
                if(eed->sharp) e->flag |= ME_SHARP;
                if(eed->seam) e->flag |= ME_SEAM;
+               if(eed->freestyle) e->flag |= ME_FREESTYLE_EDGE;
                //XXX if(eed->h & EM_FGON) e->flag |= ME_FGON;
                if(eed->h & 1) e->flag |= ME_HIDE;
                eed->tmp.e = (EditEdge*)e;
@@ -396,6 +397,7 @@ void BME_bmesh_to_editmesh(BME_Mesh *bm, BME_TransData_Head *td, EditMesh *em) {
                        eed->bweight = e->bweight;
                        if(e->flag & ME_SEAM) eed->seam = 1;
                        if(e->flag & ME_SHARP) eed->sharp = 1;
+                       if(e->flag & ME_FREESTYLE_EDGE) eed->freestyle = 1;
                        if(e->flag & SELECT) eed->f |= SELECT;
                        //XXX if(e->flag & ME_FGON) eed->h= EM_FGON; // 2 different defines!
                        if(e->flag & ME_HIDE) eed->h |= 1;