diff options
author | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2014-04-24 18:22:21 +0400 |
---|---|---|
committer | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2014-04-24 18:45:27 +0400 |
commit | 95eb5fb72776d9da5b24cd16262f671d5c762a40 (patch) | |
tree | bf601496b110e551be9d780a409bd636395a57d4 /source/blender | |
parent | 920602f3cfbf63f60bbf176ab309baa135a419df (diff) |
Fix T37452: More descriptive tooltips for freestyles settings.
Tool tips of some Freestyle parameters were revised so that parameter descriptions
are easier to understand for artists.
Diffstat (limited to 'source/blender')
-rw-r--r-- | source/blender/makesrna/intern/rna_linestyle.c | 11 | ||||
-rw-r--r-- | source/blender/makesrna/intern/rna_scene.c | 32 |
2 files changed, 22 insertions, 21 deletions
diff --git a/source/blender/makesrna/intern/rna_linestyle.c b/source/blender/makesrna/intern/rna_linestyle.c index e97f3c2b418..90040d012f3 100644 --- a/source/blender/makesrna/intern/rna_linestyle.c +++ b/source/blender/makesrna/intern/rna_linestyle.c @@ -909,10 +909,10 @@ static void rna_def_linestyle(BlenderRNA *brna) {0, NULL, 0, NULL, NULL} }; static EnumPropertyItem thickness_position_items[] = { - {LS_THICKNESS_CENTER, "CENTER", 0, "Center", "Stroke is centered along stroke geometry"}, - {LS_THICKNESS_INSIDE, "INSIDE", 0, "Inside", "Stroke is drawn inside stroke geometry"}, - {LS_THICKNESS_OUTSIDE, "OUTSIDE", 0, "Outside", "Stroke is drawn outside stroke geometry"}, - {LS_THICKNESS_RELATIVE, "RELATIVE", 0, "Relative", "Stroke thickness is split by a user-defined ratio"}, + {LS_THICKNESS_CENTER, "CENTER", 0, "Center", "Silhouettes and border edges are centered along stroke geometry"}, + {LS_THICKNESS_INSIDE, "INSIDE", 0, "Inside", "Silhouettes and border edges are drawn inside of stroke geometry"}, + {LS_THICKNESS_OUTSIDE, "OUTSIDE", 0, "Outside", "Silhouettes and border edges are drawn outside of stroke geometry"}, + {LS_THICKNESS_RELATIVE, "RELATIVE", 0, "Relative", "Silhouettes and border edges are shifted by a user-defined ratio"}, {0, NULL, 0, NULL, NULL} }; static EnumPropertyItem sort_key_items[] = { @@ -966,7 +966,8 @@ static void rna_def_linestyle(BlenderRNA *brna) prop = RNA_def_property(srna, "thickness_position", PROP_ENUM, PROP_NONE); RNA_def_property_enum_bitflag_sdna(prop, NULL, "thickness_position"); RNA_def_property_enum_items(prop, thickness_position_items); - RNA_def_property_ui_text(prop, "Thickness Position", "Select the position of stroke thickness"); + RNA_def_property_ui_text(prop, "Thickness Position", + "Thickness position of silhouettes and border edges (applicable when plain chaining is used with the Same Object option)"); RNA_def_property_update(prop, NC_LINESTYLE, NULL); prop = RNA_def_property(srna, "thickness_ratio", PROP_FLOAT, PROP_FACTOR); diff --git a/source/blender/makesrna/intern/rna_scene.c b/source/blender/makesrna/intern/rna_scene.c index 53e1686e323..d755aa9ca86 100644 --- a/source/blender/makesrna/intern/rna_scene.c +++ b/source/blender/makesrna/intern/rna_scene.c @@ -2633,9 +2633,9 @@ static void rna_def_freestyle_settings(BlenderRNA *brna) }; static EnumPropertyItem edge_type_combination_items[] = { - {0, "OR", 0, "Logical OR", "Combine feature edge type conditions by logical OR (logical disjunction)"}, + {0, "OR", 0, "Logical OR", "Select feature edges satisfying at least one of edge type conditions"}, {FREESTYLE_LINESET_FE_AND, "AND", 0, "Logical AND", - "Combine feature edge type conditions by logical AND (logical conjunction)"}, + "Select feature edges satisfying all edge type conditions"}, {0, NULL, 0, NULL, NULL} }; @@ -2662,7 +2662,7 @@ static void rna_def_freestyle_settings(BlenderRNA *brna) static EnumPropertyItem freestyle_ui_mode_items[] = { {FREESTYLE_CONTROL_SCRIPT_MODE, "SCRIPT", 0, "Python Scripting Mode", - "Advanced mode for using style modules in Python"}, + "Advanced mode for using style modules written in Python"}, {FREESTYLE_CONTROL_EDITOR_MODE, "EDITOR", 0, "Parameter Editor Mode", "Basic mode for interactive style parameter editing"}, {0, NULL, 0, NULL, NULL} @@ -2733,14 +2733,14 @@ static void rna_def_freestyle_settings(BlenderRNA *brna) RNA_def_property_enum_bitflag_sdna(prop, NULL, "flags"); RNA_def_property_enum_items(prop, edge_type_negation_items); RNA_def_property_ui_text(prop, "Edge Type Negation", - "Set the negation operation for conditions on feature edge types"); + "Specify either inclusion or exclusion of feature edges selected by edge types"); RNA_def_property_update(prop, NC_SCENE | ND_RENDER_OPTIONS, NULL); prop = RNA_def_property(srna, "edge_type_combination", PROP_ENUM, PROP_NONE); RNA_def_property_enum_bitflag_sdna(prop, NULL, "flags"); RNA_def_property_enum_items(prop, edge_type_combination_items); RNA_def_property_ui_text(prop, "Edge Type Combination", - "Set the combination operation for conditions on feature edge types"); + "Specify a logical combination of selection conditions on feature edge types"); RNA_def_property_update(prop, NC_SCENE | ND_RENDER_OPTIONS, NULL); prop = RNA_def_property(srna, "group", PROP_POINTER, PROP_NONE); @@ -2754,45 +2754,45 @@ static void rna_def_freestyle_settings(BlenderRNA *brna) RNA_def_property_enum_bitflag_sdna(prop, NULL, "flags"); RNA_def_property_enum_items(prop, group_negation_items); RNA_def_property_ui_text(prop, "Group Negation", - "Set the negation operation for conditions on feature edge types"); + "Specify either inclusion or exclusion of feature edges belonging to a group of objects"); RNA_def_property_update(prop, NC_SCENE | ND_RENDER_OPTIONS, NULL); prop = RNA_def_property(srna, "face_mark_negation", PROP_ENUM, PROP_NONE); RNA_def_property_enum_bitflag_sdna(prop, NULL, "flags"); RNA_def_property_enum_items(prop, face_mark_negation_items); RNA_def_property_ui_text(prop, "Face Mark Negation", - "Set the negation operation for the condition on face marks"); + "Specify either inclusion or exclusion of feature edges selected by face marks"); RNA_def_property_update(prop, NC_SCENE | ND_RENDER_OPTIONS, NULL); prop = RNA_def_property(srna, "face_mark_condition", PROP_ENUM, PROP_NONE); RNA_def_property_enum_bitflag_sdna(prop, NULL, "flags"); RNA_def_property_enum_items(prop, face_mark_condition_items); - RNA_def_property_ui_text(prop, "Face Mark Condition", "Set a feature edge selection condition on face marks"); + RNA_def_property_ui_text(prop, "Face Mark Condition", "Specify a feature edge selection condition based on face marks"); RNA_def_property_update(prop, NC_SCENE | ND_RENDER_OPTIONS, NULL); prop = RNA_def_property(srna, "select_silhouette", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "edge_types", FREESTYLE_FE_SILHOUETTE); - RNA_def_property_ui_text(prop, "Silhouette", "Select silhouette edges"); + RNA_def_property_ui_text(prop, "Silhouette", "Select silhouettes (edges at the boundary of visible and hidden faces)"); RNA_def_property_update(prop, NC_SCENE | ND_RENDER_OPTIONS, NULL); prop = RNA_def_property(srna, "select_border", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "edge_types", FREESTYLE_FE_BORDER); - RNA_def_property_ui_text(prop, "Border", "Select border edges"); + RNA_def_property_ui_text(prop, "Border", "Select border edges (open mesh edges)"); RNA_def_property_update(prop, NC_SCENE | ND_RENDER_OPTIONS, NULL); prop = RNA_def_property(srna, "select_crease", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "edge_types", FREESTYLE_FE_CREASE); - RNA_def_property_ui_text(prop, "Crease", "Select crease edges"); + RNA_def_property_ui_text(prop, "Crease", "Select crease edges (those between two faces making an angle smaller than the Crease Angle)"); RNA_def_property_update(prop, NC_SCENE | ND_RENDER_OPTIONS, NULL); prop = RNA_def_property(srna, "select_ridge_valley", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "edge_types", FREESTYLE_FE_RIDGE_VALLEY); - RNA_def_property_ui_text(prop, "Ridge & Valley", "Select ridges and valleys"); + RNA_def_property_ui_text(prop, "Ridge & Valley", "Select ridges and valleys (boundary lines between convex and concave areas of surface)"); RNA_def_property_update(prop, NC_SCENE | ND_RENDER_OPTIONS, NULL); prop = RNA_def_property(srna, "select_suggestive_contour", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "edge_types", FREESTYLE_FE_SUGGESTIVE_CONTOUR); - RNA_def_property_ui_text(prop, "Suggestive Contour", "Select suggestive contours"); + RNA_def_property_ui_text(prop, "Suggestive Contour", "Select suggestive contours (almost silhouette/contour edges)"); RNA_def_property_update(prop, NC_SCENE | ND_RENDER_OPTIONS, NULL); prop = RNA_def_property(srna, "select_material_boundary", PROP_BOOLEAN, PROP_NONE); @@ -2802,17 +2802,17 @@ static void rna_def_freestyle_settings(BlenderRNA *brna) prop = RNA_def_property(srna, "select_contour", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "edge_types", FREESTYLE_FE_CONTOUR); - RNA_def_property_ui_text(prop, "Contour", "Select contours"); + RNA_def_property_ui_text(prop, "Contour", "Select contours (outer silhouettes of each object)"); RNA_def_property_update(prop, NC_SCENE | ND_RENDER_OPTIONS, NULL); prop = RNA_def_property(srna, "select_external_contour", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "edge_types", FREESTYLE_FE_EXTERNAL_CONTOUR); - RNA_def_property_ui_text(prop, "External Contour", "Select external contours"); + RNA_def_property_ui_text(prop, "External Contour", "Select external contours (outer silhouettes of occuluding and occuluded objects)"); RNA_def_property_update(prop, NC_SCENE | ND_RENDER_OPTIONS, NULL); prop = RNA_def_property(srna, "select_edge_mark", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "edge_types", FREESTYLE_FE_EDGE_MARK); - RNA_def_property_ui_text(prop, "Edge Mark", "Select edge marks"); + RNA_def_property_ui_text(prop, "Edge Mark", "Select edge marks (edges annotated by Freestyle edge marks)"); RNA_def_property_update(prop, NC_SCENE | ND_RENDER_OPTIONS, NULL); prop = RNA_def_property(srna, "exclude_silhouette", PROP_BOOLEAN, PROP_NONE); |