resync @ ef8d981267702de38ffc24136f9d823d31781c60

.github/workflows/all_builds.yml

@@ -26,7 +26,7 @@ on:
 env:
   GODOT_BASE_BRANCH: master
   # Change the README too
-  GODOT_MAIN_SYNC_REF: 92e51fca7247c932f95a1662aefc28aca96e8de6
+  GODOT_MAIN_SYNC_REF: ef8d981267702de38ffc24136f9d823d31781c60
   SCONSFLAGS: verbose=yes warnings=all werror=no module_text_server_fb_enabled=yes minizip=yes debug_symbols=no deprecated=yes
   SCONSFLAGS_TEMPLATE: no_editor_splash=yes module_camera_enabled=no module_mbedtls_enabled=no module_enet_enabled=no module_mobile_vr_enabled=no module_upnp_enabled=no module_noise_enabled=no module_websocket_enabled=no use_static_cpp=yes builtin_freetype=yes builtin_libpng=yes builtin_zlib=yes builtin_libwebp=yes builtin_libvorbis=yes builtin_libogg=yes module_csg_enabled=yes module_gridmap_enabled=yes disable_3d=no
   SCONS_CACHE_MSVC_CONFIG: true

README.md

@@ -105,7 +105,8 @@ For ease of bootstrapping development, we have included launch, build, and setti
 
 ### Requirements
 
-Godot 4.0 (master branch) @ 92e51fca7247c932f95a1662aefc28aca96e8de6
+Godot 4.0 (master branch) @ ef8d981267702de38ffc24136f9d823d31781c60
+
 
 - Support for building on 3.x has been dropped and no new features are being pushed
   - Godot RE Tools still retains the ability to decompile 3.x and 2.x projects, however.

editor/gdre_editor.cpp

@@ -326,7 +326,7 @@ void GodotREEditor::init_gui(Control *p_control, HBoxContainer *p_menu, bool p_l
 		p_menu->set_anchor(Side::SIDE_TOP, 0);
 		menu_button = memnew(MenuButton);
 		menu_button->set_text(RTR("RE Tools"));
-		menu_button->set_icon(icons["RELogo"]);
+		menu_button->set_button_icon(icons["RELogo"]);
 		menu_popup = menu_button->get_popup();
 		menu_popup->add_icon_item(icons["RELogo"], RTR("Recover project..."), MENU_EXT_PCK);
 		menu_popup->add_separator();
@@ -342,7 +342,7 @@ void GodotREEditor::init_gui(Control *p_control, HBoxContainer *p_menu, bool p_l
 
 		menu_button = memnew(MenuButton);
 		menu_button->set_text(RTR("PCK"));
-		menu_button->set_icon(icons["REPack"]);
+		menu_button->set_button_icon(icons["REPack"]);
 		menu_popup = menu_button->get_popup();
 		menu_popup->add_icon_item(icons["REPack"], RTR("Create PCK archive from folder..."), MENU_CREATE_PCK);
 		menu_button->set_anchor(Side::SIDE_TOP, 0);
@@ -351,7 +351,7 @@ void GodotREEditor::init_gui(Control *p_control, HBoxContainer *p_menu, bool p_l
 
 		menu_button = memnew(MenuButton);
 		menu_button->set_text(RTR("GDScript"));
-		menu_button->set_icon(icons["REScript"]);
+		menu_button->set_button_icon(icons["REScript"]);
 		menu_popup = menu_button->get_popup();
 		menu_popup->add_icon_item(icons["REScript"], RTR("Decompile .GDC/.GDE script files..."), MENU_DECOMP_GDS);
 		menu_popup->add_icon_item(icons["REScript"], RTR("Compile .GD script files..."), MENU_COMP_GDS);
@@ -361,7 +361,7 @@ void GodotREEditor::init_gui(Control *p_control, HBoxContainer *p_menu, bool p_l
 
 		menu_button = memnew(MenuButton);
 		menu_button->set_text(RTR("Resources"));
-		menu_button->set_icon(icons["REResBT"]);
+		menu_button->set_button_icon(icons["REResBT"]);
 		menu_popup = menu_button->get_popup();
 		menu_popup->add_icon_item(icons["REResBT"], RTR("Convert binary resources to text..."), MENU_CONV_TO_TXT);
 		menu_popup->add_icon_item(icons["REResTB"], RTR("Convert text resources to binary..."), MENU_CONV_TO_BIN);
@@ -375,7 +375,7 @@ void GodotREEditor::init_gui(Control *p_control, HBoxContainer *p_menu, bool p_l
 	} else {
 		menu_button = memnew(MenuButton);
 		menu_button->set_text(RTR("RE Tools"));
-		menu_button->set_icon(icons["RELogo"]);
+		menu_button->set_button_icon(icons["RELogo"]);
 		menu_popup = menu_button->get_popup();
 
 		menu_popup->add_icon_item(icons["RELogo"], RTR("Recover project..."), MENU_EXT_PCK);