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

Maybe final meta fixes?

Browse source
This commit is contained in:
Ottermandias 2022-09-26 20:13:02 +02:00
parent 6b6e686ee6
commit 49b53b7a6a
3 changed files with 7 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Penumbra/Interop/CharacterUtility.List.cs
View file

@ -150,7 +150,7 @@ public unsafe partial class CharacterUtility
var next = list.First!.Value; var next = list.First!.Value;
if( next.Resetter ) if( next.Resetter )
{ {
List.SetResourceToDefaultCollection(); List.ResetResourceInternal();
} }
else else
{ {

9
Penumbra/Interop/Resolver/PathResolver.ResolverHooks.cs
View file

@ -151,7 +151,7 @@ public partial class PathResolver
} }
var data = GetResolveData( drawObject ); var data = GetResolveData( drawObject );
return !data.Valid ? DisposableContainer.Empty : MetaState.ResolveEqdpData(data.ModCollection, MetaState.GetHumanGenderRace( drawObject ), modelType < 5, modelType > 4); return MetaState.ResolveEqdpData(data.ModCollection, MetaState.GetHumanGenderRace( drawObject ), modelType < 5, modelType > 4);
} }
using var eqdp = Get(); using var eqdp = Get();
@ -182,14 +182,9 @@ public partial class PathResolver
return ResolvePath( drawObject, _resolveSkpPathHook.Original( drawObject, path, unk3, unk4 ) ); return ResolvePath( drawObject, _resolveSkpPathHook.Original( drawObject, path, unk3, unk4 ) );
} }
private DisposableContainer GetEstChanges( IntPtr drawObject ) private static DisposableContainer GetEstChanges( IntPtr drawObject )
{ {
var data = GetResolveData( drawObject ); var data = GetResolveData( drawObject );
if( !data.Valid )
{
return DisposableContainer.Empty;
}
return new DisposableContainer( data.ModCollection.TemporarilySetEstFile( EstManipulation.EstType.Face ), return new DisposableContainer( data.ModCollection.TemporarilySetEstFile( EstManipulation.EstType.Face ),
data.ModCollection.TemporarilySetEstFile( EstManipulation.EstType.Body ), data.ModCollection.TemporarilySetEstFile( EstManipulation.EstType.Body ),
data.ModCollection.TemporarilySetEstFile( EstManipulation.EstType.Hair ), data.ModCollection.TemporarilySetEstFile( EstManipulation.EstType.Hair ),

8
Penumbra/UI/ConfigWindow.Changelog.cs
View file

@ -19,14 +19,14 @@ public partial class ConfigWindow
Add5_7_0( ret ); Add5_7_0( ret );
Add5_7_1( ret ); Add5_7_1( ret );
Add5_8_0( ret ); Add5_8_0( ret );
Add5_8_6( ret ); Add5_8_7( ret );
return ret; return ret;
} }
private static void Add5_8_6( Changelog log ) private static void Add5_8_7( Changelog log )
=> log.NextVersion( "Version 0.5.8.6" ) => log.NextVersion( "Version 0.5.8.7" )
.RegisterEntry( "Fixed some problems with metadata reloading and reverting and IMC files. (5.8.1 to 5.8.6)." ) .RegisterEntry( "Fixed some problems with metadata reloading and reverting and IMC files. (5.8.1 to 5.8.7)." )
.RegisterHighlight( .RegisterHighlight(
"If you encounter any issues, please try completely restarting your game after updating (not just relogging), before reporting them.", "If you encounter any issues, please try completely restarting your game after updating (not just relogging), before reporting them.",
1 ); 1 );