forked from bartvdbraak/blender
Bugfix [#34012] Skeleton Sketching settings unclear
Although the bug report here wasn't exactly clear about what exactly was wrong, it soon became apparent that the UI stuff here was in need of some love. Changes: * Ported over missing tooltips from 2.49 (i.e. most of them) * Fixed a few incorrect tooltips (mostly the subdivision length settings) * Made the autonaming and number/side settings slightly clearer - number/side are used to replace placeholders in the names of template bones (&N and &S respectively) when autonaming is disabled. When it is enabled, these values are determined automatically.
This commit is contained in:
parent
56f82655ed
commit
d6b166d1a1
@ -2687,6 +2687,8 @@ class VIEW3D_PT_etch_a_ton(Panel):
|
|||||||
col.prop(toolsettings, "use_etch_quick")
|
col.prop(toolsettings, "use_etch_quick")
|
||||||
col.prop(toolsettings, "use_etch_overdraw")
|
col.prop(toolsettings, "use_etch_overdraw")
|
||||||
|
|
||||||
|
col.separator()
|
||||||
|
|
||||||
col.prop(toolsettings, "etch_convert_mode")
|
col.prop(toolsettings, "etch_convert_mode")
|
||||||
|
|
||||||
if toolsettings.etch_convert_mode == 'LENGTH':
|
if toolsettings.etch_convert_mode == 'LENGTH':
|
||||||
@ -2698,11 +2700,19 @@ class VIEW3D_PT_etch_a_ton(Panel):
|
|||||||
elif toolsettings.etch_convert_mode == 'RETARGET':
|
elif toolsettings.etch_convert_mode == 'RETARGET':
|
||||||
col.prop(toolsettings, "etch_template")
|
col.prop(toolsettings, "etch_template")
|
||||||
col.prop(toolsettings, "etch_roll_mode")
|
col.prop(toolsettings, "etch_roll_mode")
|
||||||
col.prop(toolsettings, "use_etch_autoname")
|
|
||||||
col.prop(toolsettings, "etch_number")
|
|
||||||
col.prop(toolsettings, "etch_side")
|
|
||||||
|
|
||||||
col.operator("sketch.convert", text="Convert")
|
col.separator()
|
||||||
|
|
||||||
|
colsub = col.column(align=True)
|
||||||
|
colsub.prop(toolsettings, "use_etch_autoname")
|
||||||
|
sub = colsub.column()
|
||||||
|
sub.enabled = not toolsettings.use_etch_autoname
|
||||||
|
sub.prop(toolsettings, "etch_number")
|
||||||
|
sub.prop(toolsettings, "etch_side")
|
||||||
|
|
||||||
|
col.separator()
|
||||||
|
|
||||||
|
col.operator("sketch.convert", text="Convert to Bones")
|
||||||
|
|
||||||
|
|
||||||
class VIEW3D_PT_context_properties(Panel):
|
class VIEW3D_PT_context_properties(Panel):
|
||||||
|
@ -1774,28 +1774,28 @@ static void rna_def_tool_settings(BlenderRNA *brna)
|
|||||||
/* etch-a-ton */
|
/* etch-a-ton */
|
||||||
prop = RNA_def_property(srna, "use_bone_sketching", PROP_BOOLEAN, PROP_NONE);
|
prop = RNA_def_property(srna, "use_bone_sketching", PROP_BOOLEAN, PROP_NONE);
|
||||||
RNA_def_property_boolean_sdna(prop, NULL, "bone_sketching", BONE_SKETCHING);
|
RNA_def_property_boolean_sdna(prop, NULL, "bone_sketching", BONE_SKETCHING);
|
||||||
RNA_def_property_ui_text(prop, "Use Bone Sketching", "DOC BROKEN");
|
RNA_def_property_ui_text(prop, "Use Bone Sketching", "Use sketching to create and edit bones");
|
||||||
/* RNA_def_property_ui_icon(prop, ICON_EDIT, 0); */
|
/* RNA_def_property_ui_icon(prop, ICON_EDIT, 0); */
|
||||||
|
|
||||||
prop = RNA_def_property(srna, "use_etch_quick", PROP_BOOLEAN, PROP_NONE);
|
prop = RNA_def_property(srna, "use_etch_quick", PROP_BOOLEAN, PROP_NONE);
|
||||||
RNA_def_property_boolean_sdna(prop, NULL, "bone_sketching", BONE_SKETCHING_QUICK);
|
RNA_def_property_boolean_sdna(prop, NULL, "bone_sketching", BONE_SKETCHING_QUICK);
|
||||||
RNA_def_property_ui_text(prop, "Quick Sketching", "DOC BROKEN");
|
RNA_def_property_ui_text(prop, "Quick Sketching", "Automatically convert and delete on stroke end");
|
||||||
|
|
||||||
prop = RNA_def_property(srna, "use_etch_overdraw", PROP_BOOLEAN, PROP_NONE);
|
prop = RNA_def_property(srna, "use_etch_overdraw", PROP_BOOLEAN, PROP_NONE);
|
||||||
RNA_def_property_boolean_sdna(prop, NULL, "bone_sketching", BONE_SKETCHING_ADJUST);
|
RNA_def_property_boolean_sdna(prop, NULL, "bone_sketching", BONE_SKETCHING_ADJUST);
|
||||||
RNA_def_property_ui_text(prop, "Overdraw Sketching", "DOC BROKEN");
|
RNA_def_property_ui_text(prop, "Overdraw Sketching", "Adjust strokes by drawing near them");
|
||||||
|
|
||||||
prop = RNA_def_property(srna, "use_etch_autoname", PROP_BOOLEAN, PROP_NONE);
|
prop = RNA_def_property(srna, "use_etch_autoname", PROP_BOOLEAN, PROP_NONE);
|
||||||
RNA_def_property_boolean_sdna(prop, NULL, "skgen_retarget_options", SK_RETARGET_AUTONAME);
|
RNA_def_property_boolean_sdna(prop, NULL, "skgen_retarget_options", SK_RETARGET_AUTONAME);
|
||||||
RNA_def_property_ui_text(prop, "Autoname", "DOC BROKEN");
|
RNA_def_property_ui_text(prop, "Autoname Bones", "Automatically generate values to replace &N and &S suffix placeholders in template names");
|
||||||
|
|
||||||
prop = RNA_def_property(srna, "etch_number", PROP_STRING, PROP_NONE);
|
prop = RNA_def_property(srna, "etch_number", PROP_STRING, PROP_NONE);
|
||||||
RNA_def_property_string_sdna(prop, NULL, "skgen_num_string");
|
RNA_def_property_string_sdna(prop, NULL, "skgen_num_string");
|
||||||
RNA_def_property_ui_text(prop, "Number", "DOC BROKEN");
|
RNA_def_property_ui_text(prop, "Number", "Text to replace &N with (e.g. 'Finger.&N' -> 'Finger.1' or 'Finger.One')");
|
||||||
|
|
||||||
prop = RNA_def_property(srna, "etch_side", PROP_STRING, PROP_NONE);
|
prop = RNA_def_property(srna, "etch_side", PROP_STRING, PROP_NONE);
|
||||||
RNA_def_property_string_sdna(prop, NULL, "skgen_num_string");
|
RNA_def_property_string_sdna(prop, NULL, "skgen_num_string");
|
||||||
RNA_def_property_ui_text(prop, "Side", "DOC BROKEN");
|
RNA_def_property_ui_text(prop, "Side", "Text to replace &S with (e.g. 'Arm.&S' -> 'Arm.R' or 'Arm.Right')");
|
||||||
|
|
||||||
prop = RNA_def_property(srna, "etch_template", PROP_POINTER, PROP_NONE);
|
prop = RNA_def_property(srna, "etch_template", PROP_POINTER, PROP_NONE);
|
||||||
RNA_def_property_pointer_sdna(prop, NULL, "skgen_template");
|
RNA_def_property_pointer_sdna(prop, NULL, "skgen_template");
|
||||||
@ -1814,14 +1814,14 @@ static void rna_def_tool_settings(BlenderRNA *brna)
|
|||||||
RNA_def_property_float_sdna(prop, NULL, "skgen_correlation_limit");
|
RNA_def_property_float_sdna(prop, NULL, "skgen_correlation_limit");
|
||||||
RNA_def_property_range(prop, 0.00001, 1.0);
|
RNA_def_property_range(prop, 0.00001, 1.0);
|
||||||
RNA_def_property_ui_range(prop, 0.01, 1.0, 0.01, 2);
|
RNA_def_property_ui_range(prop, 0.01, 1.0, 0.01, 2);
|
||||||
RNA_def_property_ui_text(prop, "Limit", "Number of bones in the subdivided stroke");
|
RNA_def_property_ui_text(prop, "Limit", "Correlation threshold for number of bones in the subdivided stroke");
|
||||||
RNA_def_property_update(prop, NC_SPACE | ND_SPACE_VIEW3D, NULL);
|
RNA_def_property_update(prop, NC_SPACE | ND_SPACE_VIEW3D, NULL);
|
||||||
|
|
||||||
prop = RNA_def_property(srna, "etch_length_limit", PROP_FLOAT, PROP_DISTANCE);
|
prop = RNA_def_property(srna, "etch_length_limit", PROP_FLOAT, PROP_DISTANCE);
|
||||||
RNA_def_property_float_sdna(prop, NULL, "skgen_length_limit");
|
RNA_def_property_float_sdna(prop, NULL, "skgen_length_limit");
|
||||||
RNA_def_property_range(prop, 0.00001, 100000.0);
|
RNA_def_property_range(prop, 0.00001, 100000.0);
|
||||||
RNA_def_property_ui_range(prop, 0.001, 100.0, 0.1, 3);
|
RNA_def_property_ui_range(prop, 0.001, 100.0, 0.1, 3);
|
||||||
RNA_def_property_ui_text(prop, "Length", "Number of bones in the subdivided stroke");
|
RNA_def_property_ui_text(prop, "Length", "Maximum length of the subdivided bones");
|
||||||
RNA_def_property_update(prop, NC_SPACE | ND_SPACE_VIEW3D, NULL);
|
RNA_def_property_update(prop, NC_SPACE | ND_SPACE_VIEW3D, NULL);
|
||||||
|
|
||||||
prop = RNA_def_property(srna, "etch_roll_mode", PROP_ENUM, PROP_NONE);
|
prop = RNA_def_property(srna, "etch_roll_mode", PROP_ENUM, PROP_NONE);
|
||||||
|
Loading…
Reference in New Issue
Block a user