Skip to content

Commit 986baba

Browse files
committed
git subrepo pull --branch=groups-4.6.2025-09-26T014602Z --force godot
subrepo: subdir: "godot" merged: "d65f7fce00" upstream: origin: "https://github.com/V-Sekai/godot.git" branch: "groups-4.6.2025-09-26T014602Z" commit: "d65f7fce00" git-subrepo: version: "0.4.9" origin: "https://github.com/ingydotnet/git-subrepo" commit: "4f60dd7"
1 parent 608d0a8 commit 986baba

File tree

130 files changed

+1046
-449
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

130 files changed

+1046
-449
lines changed

godot/.gitrepo

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
;
66
[subrepo]
77
remote = https://github.com/V-Sekai/godot.git
8-
branch = groups-4.6.2025-09-24T070943Z
9-
commit = 5a98671a36e7c5bcc59c780c3d35e24bf9bd6821
10-
parent = 9c5b401dcf7ff7fd111cf59e25801ac2903e8ca9
8+
branch = groups-4.6.2025-09-26T014602Z
9+
commit = d65f7fce00dce5b0526b9bc485ab1d1fe2d54748
10+
parent = 608d0a8e82377a92799a169d9e18aaceaf399414
1111
method = merge
1212
cmdver = 0.4.9

godot/COPYRIGHT.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -555,7 +555,7 @@ License: Zlib
555555
Files: thirdparty/sdl/hidapi/*
556556
Comment: hidapi
557557
Copyright: 2010, Alan Ott, Signal 11 Software
558-
License: BSD-3-Clause
558+
License: BSD-3-clause
559559

560560
Files: thirdparty/spirv-cross/*
561561
Comment: SPIRV-Cross

godot/core/config/project_settings.cpp

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1733,6 +1733,14 @@ ProjectSettings::ProjectSettings() {
17331733
GLOBAL_DEF("navigation/baking/thread_model/baking_use_multiple_threads", true);
17341734
GLOBAL_DEF("navigation/baking/thread_model/baking_use_high_priority_threads", true);
17351735
#endif // !defined(NAVIGATION_2D_DISABLED) || !defined(NAVIGATION_3D_DISABLED)
1736+
#ifndef NAVIGATION_2D_DISABLED
1737+
GLOBAL_DEF("navigation/2d/warnings/navmesh_edge_merge_errors", true);
1738+
GLOBAL_DEF("navigation/2d/warnings/navmesh_cell_size_mismatch", true);
1739+
#endif // NAVIGATION_2D_DISABLED
1740+
#ifndef NAVIGATION_3D_DISABLED
1741+
GLOBAL_DEF("navigation/3d/warnings/navmesh_edge_merge_errors", true);
1742+
GLOBAL_DEF("navigation/3d/warnings/navmesh_cell_size_mismatch", true);
1743+
#endif // NAVIGATION_3D_DISABLED
17361744

17371745
ProjectSettings::get_singleton()->add_hidden_prefix("input/");
17381746
}

godot/core/crypto/crypto.h

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -149,6 +149,8 @@ class Crypto : public RefCounted {
149149
};
150150

151151
class ResourceFormatLoaderCrypto : public ResourceFormatLoader {
152+
GDSOFTCLASS(ResourceFormatLoaderCrypto, ResourceFormatLoader);
153+
152154
public:
153155
virtual Ref<Resource> load(const String &p_path, const String &p_original_path = "", Error *r_error = nullptr, bool p_use_sub_threads = false, float *r_progress = nullptr, CacheMode p_cache_mode = CACHE_MODE_REUSE) override;
154156
virtual void get_recognized_extensions(List<String> *p_extensions) const override;
@@ -161,6 +163,8 @@ class ResourceFormatLoaderCrypto : public ResourceFormatLoader {
161163
};
162164

163165
class ResourceFormatSaverCrypto : public ResourceFormatSaver {
166+
GDSOFTCLASS(ResourceFormatSaverCrypto, ResourceFormatSaver);
167+
164168
public:
165169
virtual Error save(const Ref<Resource> &p_resource, const String &p_path, uint32_t p_flags = 0) override;
166170
virtual void get_recognized_extensions(const Ref<Resource> &p_resource, List<String> *p_extensions) const override;

godot/core/debugger/remote_debugger.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -48,9 +48,9 @@ class RemoteDebugger::PerformanceProfiler : public EngineProfiler {
4848
uint64_t last_monitor_modification_time = 0;
4949

5050
public:
51-
void toggle(bool p_enable, const Array &p_opts) {}
52-
void add(const Array &p_data) {}
53-
void tick(double p_frame_time, double p_process_time, double p_physics_time, double p_physics_frame_time) {
51+
void toggle(bool p_enable, const Array &p_opts) override {}
52+
void add(const Array &p_data) override {}
53+
void tick(double p_frame_time, double p_process_time, double p_physics_time, double p_physics_frame_time) override {
5454
if (!performance) {
5555
return;
5656
}

godot/core/debugger/remote_debugger_peer.h

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,8 @@
3737
#include "core/string/ustring.h"
3838

3939
class RemoteDebuggerPeer : public RefCounted {
40+
GDSOFTCLASS(RemoteDebuggerPeer, RefCounted);
41+
4042
protected:
4143
int max_queued_messages = 4096;
4244

@@ -54,6 +56,8 @@ class RemoteDebuggerPeer : public RefCounted {
5456
};
5557

5658
class RemoteDebuggerPeerTCP : public RemoteDebuggerPeer {
59+
GDSOFTCLASS(RemoteDebuggerPeerTCP, RemoteDebuggerPeer);
60+
5761
private:
5862
Ref<StreamPeerTCP> tcp_client;
5963
Mutex mutex;

godot/core/extension/gdextension.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -183,6 +183,8 @@ class GDExtension : public Resource {
183183
VARIANT_ENUM_CAST(GDExtension::InitializationLevel)
184184

185185
class GDExtensionResourceLoader : public ResourceFormatLoader {
186+
GDSOFTCLASS(GDExtensionResourceLoader, ResourceFormatLoader);
187+
186188
public:
187189
static Error load_gdextension_resource(const String &p_path, Ref<GDExtension> &p_extension);
188190

godot/core/io/http_client_tcp.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,8 @@
3535
#include "core/crypto/crypto.h"
3636

3737
class HTTPClientTCP : public HTTPClient {
38+
GDSOFTCLASS(HTTPClientTCP, HTTPClient);
39+
3840
private:
3941
Status status = STATUS_DISCONNECTED;
4042
IP::ResolverID resolving = IP::RESOLVER_INVALID_ID;

godot/core/io/image.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3293,13 +3293,13 @@ void Image::fill(const Color &p_color) {
32933293
ERR_FAIL_COND_MSG(is_compressed(), "Cannot fill in compressed image formats.");
32943294

32953295
uint8_t *dst_data_ptr = data.ptrw();
3296-
32973296
int pixel_size = get_format_pixel_size(format);
3297+
int64_t pixel_count = data.size() / pixel_size;
32983298

32993299
// Put first pixel with the format-aware API.
33003300
_set_color_at_ofs(dst_data_ptr, 0, p_color);
33013301

3302-
_repeat_pixel_over_subsequent_memory(dst_data_ptr, pixel_size, width * height);
3302+
_repeat_pixel_over_subsequent_memory(dst_data_ptr, pixel_size, pixel_count);
33033303
}
33043304

33053305
void Image::fill_rect(const Rect2i &p_rect, const Color &p_color) {

godot/core/io/image_loader.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -101,6 +101,8 @@ class ImageLoader {
101101
};
102102

103103
class ResourceFormatLoaderImage : public ResourceFormatLoader {
104+
GDSOFTCLASS(ResourceFormatLoaderImage, ResourceFormatLoader);
105+
104106
public:
105107
virtual Ref<Resource> load(const String &p_path, const String &p_original_path = "", Error *r_error = nullptr, bool p_use_sub_threads = false, float *r_progress = nullptr, CacheMode p_cache_mode = CACHE_MODE_REUSE) override;
106108
virtual void get_recognized_extensions(List<String> *p_extensions) const override;

0 commit comments

Comments
 (0)