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/intern/bmesh_operators.h | |
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/intern/bmesh_operators.h')
-rw-r--r-- | source/blender/bmesh/intern/bmesh_operators.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/source/blender/bmesh/intern/bmesh_operators.h b/source/blender/bmesh/intern/bmesh_operators.h index c98c3eae50b..16b38c340ff 100644 --- a/source/blender/bmesh/intern/bmesh_operators.h +++ b/source/blender/bmesh/intern/bmesh_operators.h @@ -61,7 +61,9 @@ enum { SIMFACE_PERIMETER, SIMFACE_NORMAL, SIMFACE_COPLANAR, +#ifdef WITH_FREESTYLE SIMFACE_FREESTYLE +#endif }; /* similar edge selection slot values */ @@ -74,7 +76,9 @@ enum { SIMEDGE_BEVEL, SIMEDGE_SEAM, SIMEDGE_SHARP, +#ifdef WITH_FREESTYLE SIMEDGE_FREESTYLE +#endif }; /* similar vertex selection slot values */ |