diff options
Diffstat (limited to 'core')
| -rw-r--r-- | core/io/image.cpp | 4 | ||||
| -rw-r--r-- | core/io/resource_loader.cpp | 6 | ||||
| -rw-r--r-- | core/variant/variant_call.cpp | 2 | ||||
| -rw-r--r-- | core/version.h | 12 |
4 files changed, 10 insertions, 14 deletions
diff --git a/core/io/image.cpp b/core/io/image.cpp index 736a3ec82e..8111ca447c 100644 --- a/core/io/image.cpp +++ b/core/io/image.cpp @@ -2649,7 +2649,7 @@ Error Image::compress_from_channels(CompressMode p_mode, UsedChannels p_channels _image_compress_bptc_func(this, p_channels); } break; case COMPRESS_ASTC: { - ERR_FAIL_COND_V(!_image_compress_bptc_func, ERR_UNAVAILABLE); + ERR_FAIL_COND_V(!_image_compress_astc_func, ERR_UNAVAILABLE); _image_compress_astc_func(this, p_astc_format); } break; case COMPRESS_MAX: { @@ -3535,6 +3535,8 @@ void Image::_bind_methods() { BIND_ENUM_CONSTANT(COMPRESS_ETC); BIND_ENUM_CONSTANT(COMPRESS_ETC2); BIND_ENUM_CONSTANT(COMPRESS_BPTC); + BIND_ENUM_CONSTANT(COMPRESS_ASTC); + BIND_ENUM_CONSTANT(COMPRESS_MAX); BIND_ENUM_CONSTANT(USED_CHANNELS_L); BIND_ENUM_CONSTANT(USED_CHANNELS_LA); diff --git a/core/io/resource_loader.cpp b/core/io/resource_loader.cpp index d0448e86fc..a46fac4e7a 100644 --- a/core/io/resource_loader.cpp +++ b/core/io/resource_loader.cpp @@ -310,12 +310,6 @@ Error ResourceLoader::load_threaded_request(const String &p_path, const String & thread_load_mutex->unlock(); ERR_FAIL_V_MSG(ERR_INVALID_PARAMETER, "There is no thread loading source resource '" + p_source_resource + "'."); } - //must be loading from this thread - if (thread_load_tasks[p_source_resource].loader_id != Thread::get_caller_id()) { - thread_load_mutex->unlock(); - ERR_FAIL_V_MSG(ERR_INVALID_PARAMETER, "Threading loading resource'" + local_path + " failed: Source specified: '" + p_source_resource + "' but was not called by it."); - } - //must not be already added as s sub tasks if (thread_load_tasks[p_source_resource].sub_tasks.has(local_path)) { thread_load_mutex->unlock(); diff --git a/core/variant/variant_call.cpp b/core/variant/variant_call.cpp index 0c0c8f657a..c3617d4598 100644 --- a/core/variant/variant_call.cpp +++ b/core/variant/variant_call.cpp @@ -1906,7 +1906,7 @@ static void _register_variant_builtin_methods() { bind_method(Vector4, distance_squared_to, sarray("to"), varray()); bind_method(Vector4, dot, sarray("with"), varray()); bind_method(Vector4, inverse, sarray(), varray()); - bind_method(Vector4, is_equal_approx, sarray("with"), varray()); + bind_method(Vector4, is_equal_approx, sarray("to"), varray()); bind_method(Vector4, is_zero_approx, sarray(), varray()); bind_method(Vector4, is_finite, sarray(), varray()); diff --git a/core/version.h b/core/version.h index 8ed7fe4af3..5ddb09284e 100644 --- a/core/version.h +++ b/core/version.h @@ -40,13 +40,13 @@ // Defines the main "branch" version. Patch versions in this branch should be // forward-compatible. // Example: "3.1" -#define VERSION_BRANCH "" _MKSTR(VERSION_MAJOR) "." _MKSTR(VERSION_MINOR) +#define VERSION_BRANCH _MKSTR(VERSION_MAJOR) "." _MKSTR(VERSION_MINOR) #if VERSION_PATCH // Example: "3.1.4" -#define VERSION_NUMBER "" VERSION_BRANCH "." _MKSTR(VERSION_PATCH) +#define VERSION_NUMBER VERSION_BRANCH "." _MKSTR(VERSION_PATCH) #else // patch is 0, we don't include it in the "pretty" version number. // Example: "3.1" instead of "3.1.0" -#define VERSION_NUMBER "" VERSION_BRANCH +#define VERSION_NUMBER VERSION_BRANCH #endif // VERSION_PATCH // Version number encoded as hexadecimal int with one byte for each number, @@ -57,16 +57,16 @@ // Describes the full configuration of that Godot version, including the version number, // the status (beta, stable, etc.) and potential module-specific features (e.g. mono). // Example: "3.1.4.stable.mono" -#define VERSION_FULL_CONFIG "" VERSION_NUMBER "." VERSION_STATUS VERSION_MODULE_CONFIG +#define VERSION_FULL_CONFIG VERSION_NUMBER "." VERSION_STATUS VERSION_MODULE_CONFIG // Similar to VERSION_FULL_CONFIG, but also includes the (potentially custom) VERSION_BUILD // description (e.g. official, custom_build, etc.). // Example: "3.1.4.stable.mono.official" -#define VERSION_FULL_BUILD "" VERSION_FULL_CONFIG "." VERSION_BUILD +#define VERSION_FULL_BUILD VERSION_FULL_CONFIG "." VERSION_BUILD // Same as above, but prepended with Godot's name and a cosmetic "v" for "version". // Example: "Godot v3.1.4.stable.official.mono" -#define VERSION_FULL_NAME "" VERSION_NAME " v" VERSION_FULL_BUILD +#define VERSION_FULL_NAME VERSION_NAME " v" VERSION_FULL_BUILD // Git commit hash, generated at build time in `core/version_hash.gen.cpp`. extern const char *const VERSION_HASH; |