Merged changes in the trunk up to revision 41768.
[blender-staging.git] / source / blender / blenkernel / intern / DerivedMesh.c
index 4400c895b78a2d98996b00a48e27e861e7b1f866..a76ea1852ded4f636c20712ff65c2bc05e86d3ba 100644 (file)
@@ -1341,6 +1341,7 @@ static void emDM_getEdge(DerivedMesh *dm, int index, MEdge *edge_r)
        edge_r->flag = ME_EDGEDRAW|ME_EDGERENDER;
        if (ee->seam) edge_r->flag |= ME_SEAM;
        if (ee->sharp) edge_r->flag |= ME_SHARP;
+       if (ee->freestyle) edge_r->flag |= ME_FREESTYLE_EDGE;
 #if 0
        /* this needs setup of f2 field */
        if (!ee->f2) edge_r->flag |= ME_LOOSEEDGE;
@@ -1441,6 +1442,7 @@ static void emDM_copyEdgeArray(DerivedMesh *dm, MEdge *edge_r)
                edge_r->flag = ME_EDGEDRAW|ME_EDGERENDER;
                if (ee->seam) edge_r->flag |= ME_SEAM;
                if (ee->sharp) edge_r->flag |= ME_SHARP;
+               if (ee->freestyle) edge_r->flag |= ME_FREESTYLE_EDGE;
 #if 0
                /* this needs setup of f2 field */
                if (!ee->f2) edge_r->flag |= ME_LOOSEEDGE;