mirror of
https://github.com/godotengine/godot.git
synced 2025-04-13 01:00:35 +08:00
(cherry picked from commit c553ca54d5de4c9ce9ebdf1c416985a56f20a9a7) And fixup previous bogus cherry-pick that included merge conflicts.
(cherry picked from commit c553ca54d5de4c9ce9ebdf1c416985a56f20a9a7) And fixup previous bogus cherry-pick that included merge conflicts.