Skip to content

Commit

Permalink
Merge pull request godotengine#92871 from KoBeWi/execute_order
Browse files Browse the repository at this point in the history
Remove unused order variable from EditorResourcePreview
  • Loading branch information
akien-mga committed Jun 7, 2024
2 parents 19affb6 + 20d67aa commit 1ce6df7
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 7 deletions.
4 changes: 0 additions & 4 deletions editor/editor_resource_preview.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,6 @@ void EditorResourcePreview::_preview_ready(const String &p_path, int p_hash, con
}

Item item;
item.order = order++;
item.preview = p_texture;
item.small_preview = p_small_texture;
item.last_hash = p_hash;
Expand Down Expand Up @@ -412,7 +411,6 @@ void EditorResourcePreview::queue_edited_resource_preview(const Ref<Resource> &p
String path_id = "ID:" + itos(p_res->get_instance_id());

if (cache.has(path_id) && cache[path_id].last_hash == p_res->hash_edited_version_for_preview()) {
cache[path_id].order = order++;
p_receiver->call(p_receiver_func, path_id, cache[path_id].preview, cache[path_id].small_preview, p_userdata);
return;
}
Expand All @@ -439,7 +437,6 @@ void EditorResourcePreview::queue_resource_preview(const String &p_path, Object
MutexLock lock(preview_mutex);

if (cache.has(p_path)) {
cache[p_path].order = order++;
p_receiver->call(p_receiver_func, p_path, cache[p_path].preview, cache[p_path].small_preview, p_userdata);
return;
}
Expand Down Expand Up @@ -533,7 +530,6 @@ void EditorResourcePreview::stop() {

EditorResourcePreview::EditorResourcePreview() {
singleton = this;
order = 0;
}

EditorResourcePreview::~EditorResourcePreview() {
Expand Down
3 changes: 0 additions & 3 deletions editor/editor_resource_preview.h
Original file line number Diff line number Diff line change
Expand Up @@ -99,13 +99,10 @@ class EditorResourcePreview : public Node {
Ref<Texture2D> preview;
Ref<Texture2D> small_preview;
Dictionary preview_metadata;
int order = 0;
uint32_t last_hash = 0;
uint64_t modified_time = 0;
};

int order;

HashMap<String, Item> cache;

void _preview_ready(const String &p_path, int p_hash, const Ref<Texture2D> &p_texture, const Ref<Texture2D> &p_small_texture, ObjectID id, const StringName &p_func, const Variant &p_ud, const Dictionary &p_metadata);
Expand Down

0 comments on commit 1ce6df7

Please sign in to comment.