7acd7e1246
- Fixes preview flickering on actions like undo/redo in the asset shelf (#93726), not yet for the file browser. - Fixes #130861. Makes the asset shelf use the asynchronous preview loading system of the UI instead of the file browser one. The issues above where mostly caused by the file browser caching design. The asset system and its UIs can now manage previews independently of the file browser back-end. This is another step towards making the asset system independent of the file browser, see https://developer.blender.org/docs/features/asset_system/fundamentals/from_file_browser_to_asset_system/. Code to query asset previews through file browser types is removed. Quite some work was done to prepare the UI preview system for this, to make it on par with the file browser preview system. E.g.:9d83061ed4,315e7e04a8,5055adc1c0,16ab6111f7. Note that the same change should be done to the asset/file browser, but this requires more work. Pull Request: https://projects.blender.org/blender/blender/pulls/131871
81 lines
1.9 KiB
CMake
81 lines
1.9 KiB
CMake
# SPDX-FileCopyrightText: 2023 Blender Authors
|
|
#
|
|
# SPDX-License-Identifier: GPL-2.0-or-later
|
|
|
|
set(INC
|
|
PUBLIC .
|
|
intern
|
|
intern/library_types
|
|
)
|
|
|
|
set(INC_SYS
|
|
)
|
|
|
|
set(SRC
|
|
intern/asset_catalog.cc
|
|
intern/asset_catalog_collection.cc
|
|
intern/asset_catalog_definition_file.cc
|
|
intern/asset_catalog_path.cc
|
|
intern/asset_catalog_tree.cc
|
|
intern/asset_library.cc
|
|
intern/asset_library_service.cc
|
|
intern/asset_representation.cc
|
|
intern/library_types/all_library.cc
|
|
intern/library_types/essentials_library.cc
|
|
intern/library_types/on_disk_library.cc
|
|
intern/library_types/preferences_on_disk_library.cc
|
|
intern/library_types/runtime_library.cc
|
|
intern/utils.cc
|
|
|
|
AS_asset_catalog.hh
|
|
AS_asset_catalog_path.hh
|
|
AS_asset_catalog_tree.hh
|
|
AS_asset_library.hh
|
|
AS_asset_representation.hh
|
|
AS_essentials_library.hh
|
|
intern/asset_catalog_collection.hh
|
|
intern/asset_catalog_definition_file.hh
|
|
intern/asset_library_service.hh
|
|
intern/library_types/all_library.hh
|
|
intern/library_types/essentials_library.hh
|
|
intern/library_types/on_disk_library.hh
|
|
intern/library_types/preferences_on_disk_library.hh
|
|
intern/library_types/runtime_library.hh
|
|
intern/utils.hh
|
|
)
|
|
|
|
set(LIB
|
|
PRIVATE bf::blenkernel
|
|
PRIVATE bf::blenlib
|
|
PRIVATE bf::dna
|
|
PRIVATE bf::imbuf
|
|
PRIVATE bf::intern::clog
|
|
PRIVATE bf::intern::guardedalloc
|
|
)
|
|
|
|
|
|
blender_add_lib(bf_asset_system "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")
|
|
add_library(bf::asset_system ALIAS bf_asset_system)
|
|
|
|
if(WITH_GTESTS)
|
|
set(TEST_INC
|
|
)
|
|
set(TEST_SRC
|
|
tests/asset_catalog_path_test.cc
|
|
tests/asset_catalog_test.cc
|
|
tests/asset_catalog_tree_test.cc
|
|
tests/asset_library_service_test.cc
|
|
tests/asset_library_test.cc
|
|
tests/asset_representation_test.cc
|
|
)
|
|
set(TEST_COMMON_SRC
|
|
tests/asset_library_test_common.hh
|
|
)
|
|
set(TEST_LIB
|
|
bf_asset_system
|
|
)
|
|
blender_add_test_suite_lib(asset_system
|
|
"${TEST_SRC}" "${INC};${TEST_INC}" "${INC_SYS}" "${LIB};${TEST_LIB}" "${TEST_COMMON_SRC}"
|
|
)
|
|
endif()
|