diff options
| author | Dan Goodliffe <dan@randomdan.homeip.net> | 2025-03-28 19:04:21 +0000 |
|---|---|---|
| committer | Dan Goodliffe <dan@randomdan.homeip.net> | 2025-03-28 19:04:21 +0000 |
| commit | 508ffe80c9991cc76f4fa37dd2fa21746abe3a89 (patch) | |
| tree | fe5ca4a08a246191432c304708ce76fe1c3905d6 /assetFactory/assetFactory.h | |
| parent | Create the last group in jsonParse.ll (diff) | |
| parent | Fix check for bulk removal (diff) | |
| download | ilt-508ffe80c9991cc76f4fa37dd2fa21746abe3a89.tar.bz2 ilt-508ffe80c9991cc76f4fa37dd2fa21746abe3a89.tar.xz ilt-508ffe80c9991cc76f4fa37dd2fa21746abe3a89.zip | |
Merge remote-tracking branch 'origin/ptrs'
Diffstat (limited to 'assetFactory/assetFactory.h')
| -rw-r--r-- | assetFactory/assetFactory.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/assetFactory/assetFactory.h b/assetFactory/assetFactory.h index 787f0a4..864e882 100644 --- a/assetFactory/assetFactory.h +++ b/assetFactory/assetFactory.h @@ -12,7 +12,7 @@ class Texture; class AssetFactory : public Persistence::Persistable { public: using Shapes = std::map<std::string, Shape::Ptr, std::less<>>; - using Assets = std::map<std::string, Asset::Ptr, std::less<>>; + using Assets = std::map<std::string, Asset::ManyPtr, std::less<>>; using AssImps = std::map<std::string, AssImp::Ptr, std::less<>>; using TextureFragments = std::map<std::string, TextureFragment::Ptr, std::less<>>; using Colour = RGB; |