Revision 99bef6a by Sybren A. Stüvel (temp-asset-browser-catalogs, temp-asset-browser-catalogs-ui, temp-assetlib-plus-uuid-rename) September 21, 2021, 08:55 (GMT) |
Merge remote-tracking branch 'origin/master' into temp-asset-browser-catalogs |
Revision b661536 by Sybren A. Stüvel (temp-asset-browser-catalogs, temp-asset-browser-catalogs-ui, temp-assetlib-plus-uuid-rename) September 21, 2021, 08:30 (GMT) |
Asset Catalogs: move from string identifier to UUIDs Move from a string `catalog_id` to a UUID. This avoids having to keep the ID of the catalog in sync with its semantics (so renaming from X to Y can keep the UUID the same). Since UUIDs don't communicate any human-readable information, the mapping from catalog UUID to its path (stored in the Catalog Definition File, CDF) is critical for understanding which asset is stored in which human-readable catalog. To make this less critical, and to allow manual data reconstruction after a CDF is lost/corrupted, each catalog also has a "simple name" that's stored along with the UUID. This is also stored on each asset, next to the catalog UUID. |
Revision e7e1402 by Sybren A. Stüvel (temp-asset-browser-catalogs, temp-asset-browser-catalogs-ui, temp-assetlib-plus-uuid-rename) September 21, 2021, 08:23 (GMT) |
Asset Catalog tree test: add array boundary check This makes it easier to figure out what's going on when the test isn't updated for new test data in the file it reads. No functional changes to Blender itself. |
Revision ed53fb5 by Sybren A. Stüvel (temp-asset-browser-catalogs, temp-asset-browser-catalogs-ui, temp-assetlib-plus-uuid-rename) September 21, 2021, 08:22 (GMT) |
Cleanup: asset catalog test, add explanatory comment No functional changes. |
Revision 89423ea by Sybren A. Stüvel (temp-asset-browser-catalogs, temp-asset-browser-catalogs-ui, temp-assetlib-plus-uuid-rename) September 20, 2021, 10:16 (GMT) |
Merge remote-tracking branch 'origin/master' into temp-asset-browser-catalogs |
Revision 887c2b6 by Julian Eisel (temp-asset-browser-catalogs, temp-asset-browser-catalogs-ui, temp-assetlib-plus-uuid-rename) September 19, 2021, 21:50 (GMT) |
Merge branch 'master' into temp-asset-browser-catalogs |
Revision dab0849 by Sybren A. Stüvel (temp-asset-browser-catalogs, temp-asset-browser-catalogs-ui, temp-assetlib-plus-uuid-rename) September 17, 2021, 12:52 (GMT) |
Merge remote-tracking branch 'origin/master' into temp-asset-browser-catalogs |
Revision f37e3a6 by Julian Eisel (temp-asset-browser-catalogs, temp-asset-browser-catalogs-ui, temp-assetlib-plus-uuid-rename) September 10, 2021, 09:45 (GMT) |
Merge branch 'master' into temp-asset-browser-catalogs |
Revision 28a76c5 by Julian Eisel (temp-asset-browser-catalogs, temp-asset-browser-catalogs-ui, temp-assetlib-plus-uuid-rename) September 9, 2021, 15:49 (GMT) |
Merge branch 'master' into temp-asset-browser-catalogs |
Revision 865fe33 by Julian Eisel (temp-asset-browser-catalogs, temp-asset-browser-catalogs-ui, temp-assetlib-plus-uuid-rename) September 6, 2021, 15:57 (GMT) |
Fix compile error of asset library test on Windows The `filesystem::path::c_str()` function returns the path in the native string format, which is `wchar` on Windows. Instead use the one that does a conversion to `std::string` if needed. |
Revision f08aeab by Julian Eisel (temp-asset-browser-catalogs, temp-asset-browser-catalogs-ui, temp-assetlib-plus-uuid-rename) September 6, 2021, 13:44 (GMT) |
Correct name of catalog-tree item child container alias This used to be a set, now it's a map. |
Revision d0b68f9 by Julian Eisel (temp-asset-browser-catalogs, temp-asset-browser-catalogs-ui, temp-assetlib-plus-uuid-rename) September 6, 2021, 13:44 (GMT) |
Avoid unnecessary allocations in unit test |
Revision e8eb5d8 by Julian Eisel (temp-asset-browser-catalogs, temp-asset-browser-catalogs-ui, temp-assetlib-plus-uuid-rename) September 2, 2021, 13:23 (GMT) |
Add tests for catalog tree Removes the printing of the catalog tree. Also adds and tests a function to get the full catalog path from a tree item. |
Revision ead9a15 by Julian Eisel (temp-asset-browser-catalogs, temp-asset-browser-catalogs-ui, temp-assetlib-plus-uuid-rename) September 2, 2021, 10:29 (GMT) |
Simplify catalog tree creation using std::map By using std::map with the catalog-component name as key simplifies creation quite a bit. Generally it seems like the most appropriate container for storing children in the tree. |
Revision d76863c by Julian Eisel (temp-asset-browser-catalogs, temp-asset-browser-catalogs-ui, temp-assetlib-plus-uuid-rename) September 1, 2021, 17:41 (GMT) |
Merge branch 'master' into temp-asset-browser-catalogs |
Revision 0cf37ba by Julian Eisel (temp-asset-browser-catalogs, temp-asset-browser-catalogs-ui, temp-assetlib-plus-uuid-rename) September 1, 2021, 17:36 (GMT) |
Revision c0c605d by Julian Eisel (temp-asset-browser-catalogs, temp-asset-browser-catalogs-ui, temp-assetlib-plus-uuid-rename) August 31, 2021, 14:55 (GMT) |
Use `ghc::filesystem` as platform compatible replacement for `std::filesystem` Previous commit merged the `temp-cpp-ghc-filesystem` branch into this, now we can actually use this replacment. This way the branch can be compiled on macOS. |
Revision 8c81ff5 by Julian Eisel (temp-asset-browser-catalogs, temp-asset-browser-catalogs-ui, temp-assetlib-plus-uuid-rename) August 31, 2021, 14:51 (GMT) |
Merge branch 'temp-cpp-ghc-filesystem' into temp-asset-browser-catalogs |
Revision 5d1fa2e by Julian Eisel (temp-asset-browser-catalogs, temp-asset-browser-catalogs-ui, temp-assetlib-plus-uuid-rename, temp-cpp-ghc-filesystem) August 31, 2021, 14:49 (GMT) |
Dependencies: Drop-in replacement for std::filesystem (in extern/) Introduces the ghc::filesystem library as a (leight weight, header only) drop-in replacement for std::filesystem. The latter can't be used on the minimum macOS version we support. Once that changes, we can switch to using std::filesystem directly. Part of T90379. * Add ghc::filesystem to extern/ as platform compatible replacement for std::filesystem. * Add Windows specific code to avoid issues with including Windows.h. * Add blender::bli::filesystem as alias for ghc::filesystem. That should make the ghc -> std transition easier later on since we can just change this alias. Also makes it easy to switch between the two at compile time. |
Revision 1a20b3d by Julian Eisel (temp-asset-browser-catalogs, temp-asset-browser-catalogs-ui, temp-assetlib-plus-uuid-rename) August 31, 2021, 14:29 (GMT) |
Merge branch 'master' into temp-asset-browser-catalogs |
|