diff options
| author | Rob Blanckaert <basicer@basicer.com> | 2024-08-28 20:34:46 -0700 |
|---|---|---|
| committer | Rob Blanckaert <basicer@basicer.com> | 2024-09-01 15:17:49 -0700 |
| commit | 28e7069ee00fac602ead03c4077efb3fdca21685 (patch) | |
| tree | 8c8f39177602f93b96a3fac730ac44b11950bba5 | |
| parent | ce8a837aab2568f9cdc41b4b410c478b0cd711fc (diff) | |
| download | redot-engine-28e7069ee00fac602ead03c4077efb3fdca21685.tar.gz | |
Keep looking when a preview plugin returns an empty image.
EditorResourcePreviewGenerator::_generate says that
"Returning an empty texture is an OK way to fail and
let another generator take care."
This patch enables that behavior.
| -rw-r--r-- | doc/classes/EditorResourcePreviewGenerator.xml | 4 | ||||
| -rw-r--r-- | editor/editor_resource_preview.cpp | 4 |
2 files changed, 5 insertions, 3 deletions
diff --git a/doc/classes/EditorResourcePreviewGenerator.xml b/doc/classes/EditorResourcePreviewGenerator.xml index fcfdbb5c44..9c9b6d11b2 100644 --- a/doc/classes/EditorResourcePreviewGenerator.xml +++ b/doc/classes/EditorResourcePreviewGenerator.xml @@ -23,7 +23,7 @@ <param index="2" name="metadata" type="Dictionary" /> <description> Generate a preview from a given resource with the specified size. This must always be implemented. - Returning an empty texture is an OK way to fail and let another generator take care. + Returning [code]null[/code] is an OK way to fail and let another generator take care. Care must be taken because this function is always called from a thread (not the main thread). [param metadata] dictionary can be modified to store file-specific metadata that can be used in [method EditorResourceTooltipPlugin._make_tooltip_for_path] (like image size, sample length etc.). </description> @@ -35,7 +35,7 @@ <param index="2" name="metadata" type="Dictionary" /> <description> Generate a preview directly from a path with the specified size. Implementing this is optional, as default code will load and call [method _generate]. - Returning an empty texture is an OK way to fail and let another generator take care. + Returning [code]null[/code] is an OK way to fail and let another generator take care. Care must be taken because this function is always called from a thread (not the main thread). [param metadata] dictionary can be modified to store file-specific metadata that can be used in [method EditorResourceTooltipPlugin._make_tooltip_for_path] (like image size, sample length etc.). </description> diff --git a/editor/editor_resource_preview.cpp b/editor/editor_resource_preview.cpp index 71865f7e8c..956fdc5cfa 100644 --- a/editor/editor_resource_preview.cpp +++ b/editor/editor_resource_preview.cpp @@ -221,7 +221,9 @@ void EditorResourcePreview::_generate_preview(Ref<ImageTexture> &r_texture, Ref< r_small_texture->set_image(small_image); } - break; + if (generated.is_valid()) { + break; + } } if (!p_item.resource.is_valid()) { |