godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-04 12:00:25 +00:00
Code Releases Wiki Activity

Fix MSVC warnings, rename shadowed variables, fix uninitialized values, change warnings=all to use /W4.

Browse Source
This commit is contained in:
bruvzg
2022-09-29 12:53:28 +03:00
parent 5b7f62af55
commit 0103af1ddd
240 changed files with 3390 additions and 3431 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
editor/shader_create_dialog.cpp
View File

@@ -96,20 +96,20 @@ void ShaderCreateDialog::_update_language_info() {
type_data.clear();
for (int i = 0; i < SHADER_TYPE_MAX; i++) {
ShaderTypeData data;
ShaderTypeData shader_type_data;
if (i == int(SHADER_TYPE_TEXT)) {
data.use_templates = true;
data.extensions.push_back("gdshader");
data.default_extension = "gdshader";
shader_type_data.use_templates = true;
shader_type_data.extensions.push_back("gdshader");
shader_type_data.default_extension = "gdshader";
} else if (i == int(SHADER_TYPE_INC)) {
data.extensions.push_back("gdshaderinc");
data.default_extension = "gdshaderinc";
shader_type_data.extensions.push_back("gdshaderinc");
shader_type_data.default_extension = "gdshaderinc";
} else {
data.default_extension = "tres";
shader_type_data.default_extension = "tres";
}
data.extensions.push_back("res");
data.extensions.push_back("tres");
type_data.push_back(data);
shader_type_data.extensions.push_back("res");
shader_type_data.extensions.push_back("tres");
type_data.push_back(shader_type_data);
}
}
@@ -261,9 +261,9 @@ void ShaderCreateDialog::_load_exist() {
void ShaderCreateDialog::_type_changed(int p_language) {
current_type = p_language;
ShaderTypeData data = type_data[p_language];
ShaderTypeData shader_type_data = type_data[p_language];
String selected_ext = "." + data.default_extension;
String selected_ext = "." + shader_type_data.default_extension;
String path = file_path->get_text();
String extension = "";
@@ -284,10 +284,10 @@ void ShaderCreateDialog::_type_changed(int p_language) {
type_menu->set_item_disabled(int(SHADER_TYPE_INC), load_enabled);
mode_menu->set_disabled(p_language == SHADER_TYPE_INC);
template_menu->set_disabled(!data.use_templates);
template_menu->set_disabled(!shader_type_data.use_templates);
template_menu->clear();
if (data.use_templates) {
if (shader_type_data.use_templates) {
int last_template = EditorSettings::get_singleton()->get_project_metadata("shader_setup", "last_selected_template", 0);
template_menu->add_item(TTR("Default"));
@@ -437,8 +437,6 @@ String ShaderCreateDialog::_validate_path(const String &p_path) {
}
}
ShaderTypeData data = type_data[type_menu->get_selected()];
bool found = false;
bool match = false;