From 894c240f9d007271e9d587d3c1b6f961c445b1b8 Mon Sep 17 00:00:00 2001 From: Tamito Kajiyama Date: Wed, 13 Mar 2013 06:44:43 +0000 Subject: New implementation of Freestyle edge/face marks The previous implementation of Freestyle edge/face marks was refactored based on suggestions from the latest code review by Campbell. The new implementation relies on mesh CustomData to store edge/face marks, instead of introducing extra flags in the core Mesh and BMesh data structures. The CustomData-based implementation will allow further additions of new edge/face attributes because of the independence from Mesh/BMesh. This revision is work in progress, mainly intended to address the review comments and ask for further code review in view of the trunk merger in the upcoming 2.67 release. --- source/blender/freestyle/intern/blender_interface/BlenderFileLoader.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'source/blender/freestyle') diff --git a/source/blender/freestyle/intern/blender_interface/BlenderFileLoader.cpp b/source/blender/freestyle/intern/blender_interface/BlenderFileLoader.cpp index 2018c7a740d..2e27eefadcb 100644 --- a/source/blender/freestyle/intern/blender_interface/BlenderFileLoader.cpp +++ b/source/blender/freestyle/intern/blender_interface/BlenderFileLoader.cpp @@ -521,7 +521,7 @@ void BlenderFileLoader::insertShapeNode(ObjectInstanceRen *obi, int id) if (numTris_1 == 0 && numTris_2 == 0) continue; bool fm, em1, em2, em3, em4; - fm = (vlr->flag & ME_FREESTYLE_FACE) != 0; + fm = (vlr->freestyle_face_mark) != 0; em1 = (vlr->freestyle_edge_mark & R_EDGE_V1V2) != 0; em2 = (vlr->freestyle_edge_mark & R_EDGE_V2V3) != 0; if (!vlr->v4) { -- cgit v1.2.3