Relintai/pandemonium_engine
1
0
Fork 0
mirror of https://github.com/Relintai/pandemonium_engine.git synced 2025-04-22 03:11:18 +02:00
Code Issues Packages Projects Releases Wiki Activity

Renamed the "Merge Back Local Changes" tool in the SceneTreeDock popup menu to "Merge Back Changes".

Browse Source
This commit is contained in:
Relintai 2025-04-21 16:02:44 +02:00
parent 3747474643
commit fce0335acc
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
editor/scene_tree_dock.cpp
View File

@ -3341,7 +3341,7 @@ void SceneTreeDock::_tree_rmb(const Vector2 &p_menu_pos) {
menu->add_check_item(TTR("Load As Placeholder"), TOOL_SCENE_USE_PLACEHOLDER);
menu->add_item(TTR("Make Local"), TOOL_SCENE_MAKE_LOCAL);
if (!editable && !placeholder) {
menu->add_item(TTR("Merge Back Local Changes"), TOOL_SCENE_MERGE_LOCAL_CHANGES_INTO_PACKEDSCENE);
menu->add_item(TTR("Merge Back Changes"), TOOL_SCENE_MERGE_LOCAL_CHANGES_INTO_PACKEDSCENE);
List<Node *>::Element *e = selection.front();
@ -3349,7 +3349,7 @@ void SceneTreeDock::_tree_rmb(const Vector2 &p_menu_pos) {
Node *node = e->get();
if (Object::cast_to<Spatial>(node) || Object::cast_to<Node2D>(node)) {
menu->add_item(TTR("Merge Back Local Changes No Tf"), TOOL_SCENE_MERGE_LOCAL_CHANGES_INTO_PACKEDSCENE_NO_TRANSFORM);
menu->add_item(TTR("Merge Back Changes (No Tf)"), TOOL_SCENE_MERGE_LOCAL_CHANGES_INTO_PACKEDSCENE_NO_TRANSFORM);
}
}
}