Merged changes in the trunk up to revision 41225.
[blender-staging.git] / source / blender / blenkernel / intern / DerivedMesh.c
index f9bd76e4ef0cc07b6f895562c77b6b079897d0c8..06d7838c2bc50c93269c929cb0b59db3a1c584c0 100644 (file)
@@ -1209,6 +1209,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;
@@ -1309,6 +1310,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;