summaryrefslogtreecommitdiffstats
path: root/scene/resources/2d/tile_set.h
diff options
context:
space:
mode:
authorRémi Verschelde <rverschelde@gmail.com>2024-03-14 22:35:45 +0100
committerRémi Verschelde <rverschelde@gmail.com>2024-03-14 22:35:45 +0100
commit0175be8948d68cf90c55ce08e8e5bf46ea29ce40 (patch)
tree245f4b083f754c8aa02017f6751f75f46df5ad7b /scene/resources/2d/tile_set.h
parent4163fb9c26fcde53b4e4df18d5c7a894f4a638d4 (diff)
parenta85921a8562e795b87279464a4438ea590f94ad8 (diff)
downloadredot-engine-0175be8948d68cf90c55ce08e8e5bf46ea29ce40.tar.gz
Merge pull request #89493 from KoBeWi/just_download_more_ram
Fix call queue problems when loading TileSet
Diffstat (limited to 'scene/resources/2d/tile_set.h')
-rw-r--r--scene/resources/2d/tile_set.h8
1 files changed, 8 insertions, 0 deletions
diff --git a/scene/resources/2d/tile_set.h b/scene/resources/2d/tile_set.h
index c17241a436..f1a8d42b95 100644
--- a/scene/resources/2d/tile_set.h
+++ b/scene/resources/2d/tile_set.h
@@ -637,6 +637,8 @@ private:
int next_alternative_id = 1;
};
+ bool initializing = true;
+
Ref<Texture2D> texture;
Vector2i margins;
Vector2i separation;
@@ -660,12 +662,14 @@ private:
void _queue_update_padded_texture();
Ref<ImageTexture> _create_padded_image_texture(const Ref<Texture2D> &p_source);
void _update_padded_texture();
+ void _try_emit_changed();
protected:
bool _set(const StringName &p_name, const Variant &p_value);
bool _get(const StringName &p_name, Variant &r_ret) const;
void _get_property_list(List<PropertyInfo> *p_list) const;
+ void _notification(int p_notification);
static void _bind_methods();
public:
@@ -779,13 +783,17 @@ private:
HashMap<int, SceneData> scenes;
int next_scene_id = 1;
+ bool initializing = true;
+
void _compute_next_alternative_id();
+ void _try_emit_changed();
protected:
bool _set(const StringName &p_name, const Variant &p_value);
bool _get(const StringName &p_name, Variant &r_ret) const;
void _get_property_list(List<PropertyInfo> *p_list) const;
+ void _notification(int p_notification);
static void _bind_methods();
public: