Merged changes in the trunk up to revision 41768.
[blender-staging.git] / source / blender / blenkernel / intern / subsurf_ccg.c
index 61dea5773e9e4c4f93e2f84e6777a35821916726..001d2abab01108e7fca993d0e55ba9915e8580b7 100644 (file)
@@ -749,7 +749,7 @@ static void ccgDM_getFinalEdge(DerivedMesh *dm, int edgeNum, MEdge *med)
 
                edgeFlag = (ccgdm->edgeFlags)? &ccgdm->edgeFlags[i]: NULL;
                if(edgeFlag)
-                       flags |= (*edgeFlag & (ME_SEAM | ME_SHARP))
+                       flags |= (*edgeFlag & (ME_SEAM | ME_SHARP | ME_FREESTYLE_EDGE))
                                         | ME_EDGEDRAW | ME_EDGERENDER;
                else
                        flags |= ME_EDGEDRAW | ME_EDGERENDER;
@@ -934,7 +934,7 @@ static void ccgDM_copyFinalEdgeArray(DerivedMesh *dm, MEdge *medge)
 
                if(edgeFlags) {
                        if(edgeIdx != -1) {
-                               flags |= (edgeFlags[index] & (ME_SEAM | ME_SHARP))
+                               flags |= (edgeFlags[index] & (ME_SEAM | ME_SHARP | ME_FREESTYLE_EDGE))
                                                 | ME_EDGEDRAW | ME_EDGERENDER;
                        }
                } else {