diff options
| author | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2011-09-20 03:24:14 +0400 |
|---|---|---|
| committer | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2011-09-20 03:24:14 +0400 |
| commit | 5582d9fac13123397297db54a0478a63a1b75194 (patch) | |
| tree | 242143a9ab8e411858f0c2a67ebc28447a821721 /source/blender/makesrna/intern/rna_linestyle.c | |
| parent | 81702789d15668f22b1cd173361b3f20fb1fea34 (diff) | |
Rearranged the organization of chaining options in line styles.
New there are only two chaining types: plain and sketchy. Both chaining types
have the "same object" option. With this option enabled, only feature edges of
the same object are chained. The sketchy chaining also has the "rounds" option
to specify the number of rounds in a sketchy multiple touch.
Also removed a temporary workaround (implemented by means of a custom chaining
rule) for infinite straight lines, which has resulted in much cleaner strokes.
Diffstat (limited to 'source/blender/makesrna/intern/rna_linestyle.c')
| -rw-r--r-- | source/blender/makesrna/intern/rna_linestyle.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/source/blender/makesrna/intern/rna_linestyle.c b/source/blender/makesrna/intern/rna_linestyle.c index 415379b39d1..608d5c295a4 100644 --- a/source/blender/makesrna/intern/rna_linestyle.c +++ b/source/blender/makesrna/intern/rna_linestyle.c @@ -675,9 +675,8 @@ static void rna_def_linestyle(BlenderRNA *brna) {LS_PANEL_MISC, "MISC", 0, "Misc", "Show the panel for miscellaneous options."}, {0, NULL, 0, NULL, NULL}}; static EnumPropertyItem chaining_items[] = { - {LS_CHAINING_NATURAL, "NATURAL", 0, "Natural", "Natural chaining."}, - {LS_CHAINING_SKETCHY_TOPOLOGY_PRESERVED, "SKETCHY_TOPOLOGY_PRESERVED", 0, "Sketchy: Topology Preserved", "Natural chaining with a sketchy multiple touch."}, - {LS_CHAINING_SKETCHY_TOPOLOGY_BROKEN, "SKETCHY_TOPOLOGY_BROKEN", 0, "Sketchy: Topology Broken", "Sketchy chaining with a broken topology of objects."}, + {LS_CHAINING_PLAIN, "PLAIN", 0, "Plain", "Plain chaining."}, + {LS_CHAINING_SKETCHY, "SKETCHY", 0, "Sketchy", "Sketchy chaining with a multiple touch."}, {0, NULL, 0, NULL, NULL}}; static EnumPropertyItem cap_items[] = { {LS_CAPS_BUTT, "BUTT", 0, "Butt", "Butt cap (flat)."}, @@ -737,7 +736,7 @@ static void rna_def_linestyle(BlenderRNA *brna) prop= RNA_def_property(srna, "rounds", PROP_INT, PROP_UNSIGNED); RNA_def_property_int_sdna(prop, NULL, "rounds"); RNA_def_property_range(prop, 1, 1000); - RNA_def_property_ui_text(prop, "Rounds", "Number of rounds in a sketch multiple touch."); + RNA_def_property_ui_text(prop, "Rounds", "Number of rounds in a sketchy multiple touch."); RNA_def_property_update(prop, NC_SCENE, NULL); prop= RNA_def_property(srna, "geometry_modifiers", PROP_COLLECTION, PROP_NONE); |