godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #95898 from KoBeWi/capital_of_nonexistent_properties 

Remove references to deleted `capitalize_properties` setting
This commit is contained in:
Rémi Verschelde 2024-08-22 00:10:50 +02:00
parent 2a98d8d78a b314a9105a
commit 720615a913
No known key found for this signature in database
GPG Key ID: C3336907360768E1
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
editor/editor_property_name_processor.h
View File

@ -51,7 +51,7 @@ class EditorPropertyNameProcessor : public Node {
StringName _get_context(const String &p_name, const String &p_property, const StringName &p_class) const;
public:
// Matches `interface/inspector/capitalize_properties` editor setting.
// Matches `interface/inspector/default_property_name_style` editor setting.
enum Style {
STYLE_RAW,
STYLE_CAPITALIZED,

9
editor/inspector_dock.cpp
View File

@ -141,13 +141,14 @@ void InspectorDock::_menu_option_confirm(int p_option, bool p_confirmed) {
unique_resources_list_tree->clear();
if (resource_propnames.size()) {
TreeItem *root = unique_resources_list_tree->create_item();
const EditorPropertyNameProcessor::Style name_style = inspector->get_property_name_style();
for (int i = 0; i < resource_propnames.size(); i++) {
String propname = resource_propnames[i].replace("/", " / ");
TreeItem *root = unique_resources_list_tree->create_item();
for (const String &E : resource_propnames) {
const String propname = EditorPropertyNameProcessor::get_singleton()->process_name(E, name_style);
TreeItem *ti = unique_resources_list_tree->create_item(root);
ti->set_text(0, bool(EDITOR_GET("interface/inspector/capitalize_properties")) ? propname.capitalize() : propname);
ti->set_text(0, propname);
}
unique_resources_label->set_text(TTR("The following resources will be duplicated and embedded within this resource/object."));