Hi, Many thanks for the report. The missing code is still necessary and should not have been removed. I just fixed the issue in the Freestyle branch revision 51868.
With best regards, -- KAJIYAMA, Tamito <rd6t-k...@asahi-net.or.jp> -----Original Message----- From: IRIE Shinsuke Sent: Sunday, November 04, 2012 2:09 PM To: bf-blender developers Subject: [Bf-committers] Is Freestyle branch update correct? Hi, I was checking Freestyle branch r51854 and noticed a part of the modifications has been lost when some codes in bmo_utils.c were moved to bmo_similar.c in r51755. Before r51854, the difference between trunk and Freestyle branch is: diff -urN trunk/source/blender/bmesh/operators/bmo_utils.c freestyle/source/blender/bmesh/operators/bmo_utils.c --- trunk/source/blender/bmesh/operators/bmo_utils.c 2012-10-22 00:20:53.419037000 +0900 +++ freestyle/source/blender/bmesh/operators/bmo_utils.c 2012-10-29 10:09:12.317632000 +0900 @@ -668,6 +668,13 @@ cont = FALSE; } break; + + case SIMFACE_FREESTYLE: + if (BM_elem_flag_test(fm, BM_ELEM_FREESTYLE) == BM_elem_flag_test(fs, BM_ELEM_FREESTYLE)) { + BMO_elem_flag_enable(bm, fm, FACE_MARK); + cont = 0; + } + break; } } } @@ -873,6 +880,13 @@ cont = FALSE; } break; + + case SIMEDGE_FREESTYLE: + if (BM_elem_flag_test(e, BM_ELEM_FREESTYLE) == BM_elem_flag_test(es, BM_ELEM_FREESTYLE)) { + BMO_elem_flag_enable(bm, e, EDGE_MARK); + cont = 0; + } + break; } } } After r51854, the difference is: diff -urN trunk/source/blender/bmesh/operators/bmo_similar.c freestyle/source/blender/bmesh/operators/bmo_similar.c --- trunk/source/blender/bmesh/operators/bmo_similar.c 2012-11-01 18:54:00.725269000 +0900 +++ freestyle/source/blender/bmesh/operators/bmo_similar.c 2012-11-04 11:22:56.114902000 +0900 @@ -463,6 +463,12 @@ cont = FALSE; } break; + case SIMEDGE_FREESTYLE: + if (BM_elem_flag_test(e, BM_ELEM_FREESTYLE) == BM_elem_flag_test(es, BM_ELEM_FREESTYLE)) { + BMO_elem_flag_enable(bm, e, EDGE_MARK); + cont = 0; + } + break; default: BLI_assert(0); } Tamito, did you remove "case SIMFACE_FREESTYLE: ..." accidentally? Or, is it no longer necessary? -- IRIE Shinsuke _______________________________________________ Bf-committers mailing list Bf-committers@blender.org http://lists.blender.org/mailman/listinfo/bf-committers _______________________________________________ Bf-committers mailing list Bf-committers@blender.org http://lists.blender.org/mailman/listinfo/bf-committers