update master sync @ 4366f8bcd

bruvzg · Jun 19, 2022 · 2d10978 · 2d10978
1 parent ba5bb9d
commit 2d10978
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/.github/workflows/all_builds.yml b/.github/workflows/all_builds.yml
@@ -23,7 +23,8 @@ on:
 # SCONS_CACHE for windows must be set in the build environment
 env:
   GODOT_BASE_BRANCH: master
-  GODOT_MAIN_SYNC_REF: ff75a49227d8d81f99b728fc89b1e4e6e79ed5be
+  # Change the README too
+  GODOT_MAIN_SYNC_REF: 4366f8bcd455714a5cd29374726d83b674ff0430
   SCONSFLAGS: verbose=yes warnings=all werror=no module_text_server_fb_enabled=yes debug_symbols=no
   SCONSFLAGS_TEMPLATE: no_editor_splash=yes module_bmp_enabled=no module_camera_enabled=no module_cvtt_enabled=no module_mbedtls_enabled=no module_tga_enabled=no module_enet_enabled=no module_mobile_vr_enabled=no module_upnp_enabled=no module_noise_enabled=no module_websocket_enabled=no module_xatlas_unwrap_enabled=no module_squish_enabled=no use_static_cpp=yes builtin_freetype=yes builtin_libpng=yes builtin_zlib=yes builtin_libwebp=yes builtin_libogg=yes module_csg_enabled=yes module_gridmap_enabled=yes disable_3d=no
   SCONS_CACHE_MSVC_CONFIG: true

diff --git a/README.md b/README.md
@@ -45,7 +45,7 @@ Use the same Godot tools version that the original game was compiled in to edit
 
 ## Requirements
 
-Godot 4.0 (master branch) @ commit https://github.com/godotengine/godot/commit/ff75a49227d8d81f99b728fc89b1e4e6e79ed5be
+Godot 4.0 (master branch) @ commit https://github.com/godotengine/godot/commit/4366f8bcd455714a5cd29374726d83b674ff0430
 - Support for building on 3.x has been dropped and no new features are being pushed.
 
 ## GDScript decompiler compatibility

diff --git a/editor/gdre_editor.cpp b/editor/gdre_editor.cpp
@@ -410,7 +410,7 @@ void GodotREEditor::init_gui(Control *p_control, HBoxContainer *p_menu, bool p_l
 		about_label->set_custom_minimum_size(Size2(600, 100) * EDSCALE);
 		about_label->set_v_size_flags(Control::SIZE_EXPAND_FILL);
 		about_label->set_h_size_flags(Control::SIZE_EXPAND_FILL);
-		about_label->set_autowrap_mode(Label::AUTOWRAP_WORD_SMART);
+		about_label->set_autowrap_mode(TextServer::AUTOWRAP_WORD_SMART);
 		String about_text =
 				String("Godot RE Tools, ") + String(GDRE_VERSION) + String(" \n\n") +
 				RTR(String("Resources, binary code and source code might be protected by copyright and trademark\n") +