diff options
| author | Haoyu Qiu <timothyqiu32@gmail.com> | 2021-11-01 18:57:59 +0800 |
|---|---|---|
| committer | Haoyu Qiu <timothyqiu32@gmail.com> | 2021-11-01 18:57:59 +0800 |
| commit | 10818cfc102d9c0ac0e28b25a3997e6b6d93c2fd (patch) | |
| tree | 12de7000e7533211a0707d2798de559235ed4480 | |
| parent | efbbd14af3f3325c4201518528e7acb93d60098a (diff) | |
Fix memory leak when using CurveTexture.set_texture_mode
| -rw-r--r-- | drivers/gles3/rasterizer_storage_gles3.cpp | 2 | ||||
| -rw-r--r-- | scene/resources/texture.cpp | 1 | ||||
| -rw-r--r-- | servers/rendering/rasterizer_dummy.h | 2 |
3 files changed, 4 insertions, 1 deletions
diff --git a/drivers/gles3/rasterizer_storage_gles3.cpp b/drivers/gles3/rasterizer_storage_gles3.cpp index 1feb2c224e..8a070313f8 100644 --- a/drivers/gles3/rasterizer_storage_gles3.cpp +++ b/drivers/gles3/rasterizer_storage_gles3.cpp @@ -625,6 +625,8 @@ void RasterizerStorageGLES3::texture_replace(RID p_texture, RID p_by_texture) { for (int n = 0; n < tex_from->images.size(); n++) { texture_set_data(p_texture, tex_from->images[n], n); } + + free(p_by_texture); } bool RasterizerStorageGLES3::_is_main_thread() { diff --git a/scene/resources/texture.cpp b/scene/resources/texture.cpp index dafc32b490..485074e283 100644 --- a/scene/resources/texture.cpp +++ b/scene/resources/texture.cpp @@ -1503,6 +1503,7 @@ Ref<Curve> CurveTexture::get_curve() const { } void CurveTexture::set_texture_mode(TextureMode p_mode) { + ERR_FAIL_COND(p_mode < TEXTURE_MODE_RGB || p_mode > TEXTURE_MODE_RED); if (texture_mode == p_mode) { return; } diff --git a/servers/rendering/rasterizer_dummy.h b/servers/rendering/rasterizer_dummy.h index f4a44c30f9..44e07a1853 100644 --- a/servers/rendering/rasterizer_dummy.h +++ b/servers/rendering/rasterizer_dummy.h @@ -258,7 +258,7 @@ public: Ref<Image> texture_2d_layer_get(RID p_texture, int p_layer) const override { return Ref<Image>(); } Vector<Ref<Image>> texture_3d_get(RID p_texture) const override { return Vector<Ref<Image>>(); } - void texture_replace(RID p_texture, RID p_by_texture) override {} + void texture_replace(RID p_texture, RID p_by_texture) override { free(p_by_texture); } void texture_set_size_override(RID p_texture, int p_width, int p_height) override {} void texture_set_path(RID p_texture, const String &p_path) override {} |