godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #25415 from akien-mga/recursive-resource-assignments 

Fix recursive assignment of Textures and other resources
This commit is contained in:
Rémi Verschelde 2019-01-28 15:31:43 +01:00 committed by GitHub
parent 70689ebffd 402cfa983d
commit 89e7c2cb13
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
scene/resources/font.cpp
View File

@ -497,6 +497,7 @@ Size2 Font::get_string_size(const String &p_string) const {
} }
void BitmapFont::set_fallback(const Ref<BitmapFont> &p_fallback) { void BitmapFont::set_fallback(const Ref<BitmapFont> &p_fallback) {
ERR_FAIL_COND(p_fallback == this);
fallback = p_fallback; fallback = p_fallback;
} }

5
scene/resources/texture.cpp
View File

@ -943,6 +943,7 @@ uint32_t AtlasTexture::get_flags() const {
void AtlasTexture::set_atlas(const Ref<Texture> &p_atlas) { void AtlasTexture::set_atlas(const Ref<Texture> &p_atlas) {
ERR_FAIL_COND(p_atlas == this);
if (atlas == p_atlas) if (atlas == p_atlas)
return; return;
atlas = p_atlas; atlas = p_atlas;
@ -1182,6 +1183,7 @@ void LargeTexture::set_piece_offset(int p_idx, const Point2 &p_offset) {
void LargeTexture::set_piece_texture(int p_idx, const Ref<Texture> &p_texture) { void LargeTexture::set_piece_texture(int p_idx, const Ref<Texture> &p_texture) {
ERR_FAIL_COND(p_texture == this);
ERR_FAIL_INDEX(p_idx, pieces.size()); ERR_FAIL_INDEX(p_idx, pieces.size());
pieces.write[p_idx].texture = p_texture; pieces.write[p_idx].texture = p_texture;
}; };
@ -1747,6 +1749,7 @@ void ProxyTexture::_bind_methods() {
void ProxyTexture::set_base(const Ref<Texture> &p_texture) { void ProxyTexture::set_base(const Ref<Texture> &p_texture) {
ERR_FAIL_COND(p_texture == this);
base = p_texture; base = p_texture;
if (base.is_valid()) { if (base.is_valid()) {
VS::get_singleton()->texture_set_proxy(proxy, base->get_rid()); VS::get_singleton()->texture_set_proxy(proxy, base->get_rid());
@ -1862,6 +1865,8 @@ int AnimatedTexture::get_frames() const {
} }
void AnimatedTexture::set_frame_texture(int p_frame, const Ref<Texture> &p_texture) { void AnimatedTexture::set_frame_texture(int p_frame, const Ref<Texture> &p_texture) {
ERR_FAIL_COND(p_texture == this);
ERR_FAIL_INDEX(p_frame, MAX_FRAMES); ERR_FAIL_INDEX(p_frame, MAX_FRAMES);
RWLockWrite w(rw_lock); RWLockWrite w(rw_lock);