diff options
| author | Hans Goudey <h.goudey@me.com> | 2022-03-24 21:10:16 +0300 |
|---|---|---|
| committer | Hans Goudey <h.goudey@me.com> | 2022-03-24 21:10:16 +0300 |
| commit | 067d0d44669f85f9b96bf3a792574cc3658f03a0 (patch) | |
| tree | 3dc85b07bfad66ae8f5ac822bdb9174c4fd2ec02 | |
| parent | fb3a0a34b4d2d2e777578d28626558670b717f3b (diff) | |
Fix: Missing "Hair" to "Curves" rename
Missed in fe1816f67fbc6aaf383ec
| -rw-r--r-- | release/scripts/startup/bl_ui/space_userpref.py | 4 | ||||
| -rw-r--r-- | source/blender/makesrna/intern/rna_ID.c | 6 | ||||
| -rw-r--r-- | source/blender/makesrna/intern/rna_userdef.c | 4 |
3 files changed, 9 insertions, 5 deletions
diff --git a/release/scripts/startup/bl_ui/space_userpref.py b/release/scripts/startup/bl_ui/space_userpref.py index 3a72d3e2096..f9642a2dbb6 100644 --- a/release/scripts/startup/bl_ui/space_userpref.py +++ b/release/scripts/startup/bl_ui/space_userpref.py @@ -386,8 +386,8 @@ class USERPREF_PT_edit_objects_duplicate_data(EditingPanel, CenterAlignMixIn, Pa col.prop(edit, "use_duplicate_curve", text="Curve") # col.prop(edit, "use_duplicate_fcurve", text="F-Curve") # Not implemented. col.prop(edit, "use_duplicate_grease_pencil", text="Grease Pencil") - if hasattr(edit, "use_duplicate_hair"): - col.prop(edit, "use_duplicate_hair", text="Hair") + if hasattr(edit, "use_duplicate_curves"): + col.prop(edit, "use_duplicate_curves", text="Curves") col = flow.column() col.prop(edit, "use_duplicate_lattice", text="Lattice") diff --git a/source/blender/makesrna/intern/rna_ID.c b/source/blender/makesrna/intern/rna_ID.c index a9725da7841..82d90a5c54b 100644 --- a/source/blender/makesrna/intern/rna_ID.c +++ b/source/blender/makesrna/intern/rna_ID.c @@ -137,7 +137,11 @@ const struct IDFilterEnumPropertyItem rna_enum_id_type_filter_items[] = { ICON_OUTLINER_COLLECTION, "Collections", "Show Collection data-blocks"}, - {FILTER_ID_CV, "filter_hair", ICON_CURVES_DATA, "Hairs", "Show/hide Hair data-blocks"}, + {FILTER_ID_CV, + "filter_curves", + ICON_CURVES_DATA, + "Hair Curves", + "Show/hide Curves data-blocks"}, {FILTER_ID_IM, "filter_image", ICON_IMAGE_DATA, "Images", "Show Image data-blocks"}, {FILTER_ID_LA, "filter_light", ICON_LIGHT_DATA, "Lights", "Show Light data-blocks"}, {FILTER_ID_LP, diff --git a/source/blender/makesrna/intern/rna_userdef.c b/source/blender/makesrna/intern/rna_userdef.c index 03f512b5528..164564241ed 100644 --- a/source/blender/makesrna/intern/rna_userdef.c +++ b/source/blender/makesrna/intern/rna_userdef.c @@ -5278,10 +5278,10 @@ static void rna_def_userdef_edit(BlenderRNA *brna) RNA_def_property_ui_text( prop, "Duplicate GPencil", "Causes grease pencil data to be duplicated with the object"); - prop = RNA_def_property(srna, "use_duplicate_hair", PROP_BOOLEAN, PROP_NONE); + prop = RNA_def_property(srna, "use_duplicate_curves", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "dupflag", USER_DUP_CURVES); RNA_def_property_ui_text( - prop, "Duplicate Hair", "Causes hair data to be duplicated with the object"); + prop, "Duplicate Curves", "Causes curves data to be duplicated with the object"); prop = RNA_def_property(srna, "use_duplicate_pointcloud", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "dupflag", USER_DUP_POINTCLOUD); |