Ellpeck/MLEM
1
0
Fork 0
mirror of https://github.com/Ellpeck/MLEM.git synced 2024-11-24 21:48:35 +01:00
Code Issues Projects Releases Wiki Activity

Compare commits

base: Ellpeck:f6c59dc4030dd7cfbf59dbdca400dc5aa7592239
Branches Tags
Ellpeck:main
Ellpeck:7.1.1
Ellpeck:7.1.0
Ellpeck:7.0.0
Ellpeck:6.3.1
Ellpeck:6.3.0
...
compare: Ellpeck:543560feacbc58ed774e6968dac1c6ffbad4fb67
Branches Tags
Ellpeck:main
Ellpeck:7.1.1
Ellpeck:7.1.0
Ellpeck:7.0.0
Ellpeck:6.3.1
Ellpeck:6.3.0

2 commits
f6c59dc403 ... 543560feac

Author SHA1 Message Date
Ell
543560feac Merge remote-tracking branch 'origin/main' 2021-11-08 23:47:04 +01:00
Ell
9ef5c35e52 Set GraphicsResource Name when loading assets using RawContentManager 2021-11-08 23:46:59 +01:00
2 changed files with 3 additions and 0 deletions
Show stats Expand all files Collapse all files

1
CHANGELOG.md
View file

@ -43,6 +43,7 @@ Additions
Improvements Improvements
- Use TitleContainer for opening streams where possible - Use TitleContainer for opening streams where possible
- Set GraphicsResource Name when loading assets using RawContentManager
## 5.1.0 ## 5.1.0
### MLEM ### MLEM

2
MLEM.Data/Content/RawContentManager.cs
View file

@ -67,6 +67,8 @@ namespace MLEM.Data.Content {
this.LoadedAssets[assetName] = t; this.LoadedAssets[assetName] = t;
if (t is IDisposable d && !this.disposableAssets.Contains(d)) if (t is IDisposable d && !this.disposableAssets.Contains(d))
this.disposableAssets.Add(d); this.disposableAssets.Add(d);
if (t is GraphicsResource r)
r.Name = assetName;
return t; return t;
} }
} catch (FileNotFoundException) { } catch (FileNotFoundException) {