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

Merge pull request #97185 from KoBeWi/ID_war 

Fix FileSystemDock's EditorContextMenuPlugins
This commit is contained in:
Rémi Verschelde 2024-09-19 17:13:53 +02:00
parent d788205826 5901a7a3d1
commit c8d76c1edd
No known key found for this signature in database
GPG Key ID: C3336907360768E1
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
editor/filesystem_dock.cpp
View File

@ -2662,8 +2662,11 @@ void FileSystemDock::_file_option(int p_option, const Vector<String> &p_selected
} break; } break;
default: { default: {
// Resource conversion commands: if (p_option >= EditorContextMenuPlugin::BASE_ID) {
if (p_option >= CONVERT_BASE_ID) { if (!EditorContextMenuPluginManager::get_singleton()->activate_custom_option(EditorContextMenuPlugin::CONTEXT_SLOT_FILESYSTEM, p_option, p_selected)) {
EditorContextMenuPluginManager::get_singleton()->activate_custom_option(EditorContextMenuPlugin::CONTEXT_SLOT_FILESYSTEM_CREATE, p_option, p_selected);
}
} else if (p_option >= CONVERT_BASE_ID) {
selected_conversion_id = p_option - CONVERT_BASE_ID; selected_conversion_id = p_option - CONVERT_BASE_ID;
ERR_FAIL_INDEX(selected_conversion_id, (int)cached_valid_conversion_targets.size()); ERR_FAIL_INDEX(selected_conversion_id, (int)cached_valid_conversion_targets.size());
@ -2681,10 +2684,6 @@ void FileSystemDock::_file_option(int p_option, const Vector<String> &p_selected
} }
conversion_id++; conversion_id++;
} }
} else {
if (!EditorContextMenuPluginManager::get_singleton()->activate_custom_option(EditorContextMenuPlugin::CONTEXT_SLOT_FILESYSTEM, p_option, p_selected)) {
EditorContextMenuPluginManager::get_singleton()->activate_custom_option(EditorContextMenuPlugin::CONTEXT_SLOT_FILESYSTEM_CREATE, p_option, p_selected);
}
} }
break; break;
} }