diff options
author | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2012-02-05 16:50:01 +0400 |
---|---|---|
committer | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2012-02-05 16:50:01 +0400 |
commit | b0d39d83b9cd4c1752684080b0c264d302d67154 (patch) | |
tree | fc6aa61a9080d81548ec77cf2d859973b07f7afb /source/blender/freestyle | |
parent | 29db9103e9c85356a057166be4f71c778cd97a45 (diff) |
Unified "Ridge" and "Valley" into "Ridge & Valley" in the Parameter Editor mode.
The Valley edge type is merely an alias of Ridge in the present Freestyle implementation.
Diffstat (limited to 'source/blender/freestyle')
-rw-r--r-- | source/blender/freestyle/intern/blender_interface/FRS_freestyle.cpp | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/source/blender/freestyle/intern/blender_interface/FRS_freestyle.cpp b/source/blender/freestyle/intern/blender_interface/FRS_freestyle.cpp index d81e887be07..31dc8629f92 100644 --- a/source/blender/freestyle/intern/blender_interface/FRS_freestyle.cpp +++ b/source/blender/freestyle/intern/blender_interface/FRS_freestyle.cpp @@ -275,8 +275,7 @@ extern "C" { {FREESTYLE_FE_SILHOUETTE, 0}, {FREESTYLE_FE_BORDER, 0}, {FREESTYLE_FE_CREASE, 0}, - {FREESTYLE_FE_RIDGE, 0}, - {FREESTYLE_FE_VALLEY, 0}, + {FREESTYLE_FE_RIDGE_VALLEY, 0}, {FREESTYLE_FE_SUGGESTIVE_CONTOUR, 0}, {FREESTYLE_FE_MATERIAL_BOUNDARY, 0}, {FREESTYLE_FE_CONTOUR, 0}, @@ -315,8 +314,7 @@ extern "C" { conditions[i].value *= -1; logical_and = !logical_and; } - if (test_edge_type_conditions(conditions, num_edge_types, logical_and, FREESTYLE_FE_RIDGE, true) || - test_edge_type_conditions(conditions, num_edge_types, logical_and, FREESTYLE_FE_VALLEY, true)) + if (test_edge_type_conditions(conditions, num_edge_types, logical_and, FREESTYLE_FE_RIDGE_VALLEY, true)) ++use_ridges_and_valleys; if (test_edge_type_conditions(conditions, num_edge_types, logical_and, FREESTYLE_FE_SUGGESTIVE_CONTOUR, true)) ++use_suggestive_contours; |