ToxicMushroom/Penumbra
1
0
Fork 0
mirror of https://github.com/xivdev/Penumbra.git synced 2025-12-15 05:04:15 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Change subfile handling to maybe retain associated game object for Mare.

Browse source
This commit is contained in:
Ottermandias 2022-12-29 00:36:35 +01:00
parent 4df9ac4632
commit 87b6fe6aa6
5 changed files with 31 additions and 46 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Penumbra/Interop/Resolver/PathResolver.cs
View file

@ -42,7 +42,7 @@ public partial class PathResolver : IDisposable
_animations = new AnimationState( DrawObjects );
_paths = new PathState( this );
_meta = new MetaState( _paths.HumanVTable );
_subFiles = new SubfileHelper( _paths );
_subFiles = new SubfileHelper( _loader );
}
// The modified resolver that handles game path resolving.
@ -69,7 +69,7 @@ public partial class PathResolver : IDisposable
// Since mtrl files load their files separately, we need to add the new, resolved path
// so that the functions loading tex and shpk can find that path and use its collection.
// We also need to handle defaulted materials against a non-default collection.
var path = resolved == null ? gamePath.Path.ToString() : resolved.Value.FullName;
var path = resolved == null ? gamePath.Path : resolved.Value.InternalName;
SubfileHelper.HandleCollection( resolveData, path, nonDefault, type, resolved, out data );
return true;
}