diff options
| author | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2012-12-20 11:57:26 +0400 |
|---|---|---|
| committer | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2012-12-20 11:57:26 +0400 |
| commit | a462d69bbf771e49d2fa49589608c375376b42ed (patch) | |
| tree | 60d85d4131399a0a39dbc582e30a7144b14edc18 /source/blender/bmesh/operators/bmo_similar.c | |
| parent | d433cd65f7127d60e17d05a824290423ad226eae (diff) | |
Another big patch set by Bastien Montagne, thanks a lot!
* Made Freestyle optional (turned on by default).
* Fix for missing bpath.c updates in the previous merge of trunk changes.
Diffstat (limited to 'source/blender/bmesh/operators/bmo_similar.c')
| -rw-r--r-- | source/blender/bmesh/operators/bmo_similar.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/source/blender/bmesh/operators/bmo_similar.c b/source/blender/bmesh/operators/bmo_similar.c index 78b6ebb4bd7..a8cc152bd4e 100644 --- a/source/blender/bmesh/operators/bmo_similar.c +++ b/source/blender/bmesh/operators/bmo_similar.c @@ -245,12 +245,14 @@ void bmo_similar_faces_exec(BMesh *bm, BMOperator *op) cont = FALSE; } break; +#ifdef WITH_FREESTYLE 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 = FALSE; } break; +#endif default: BLI_assert(0); } @@ -469,12 +471,14 @@ void bmo_similar_edges_exec(BMesh *bm, BMOperator *op) cont = FALSE; } break; +#ifdef WITH_FREESTYLE 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 = FALSE; } break; +#endif default: BLI_assert(0); } |