@@ -1920,16 +1920,17 @@ await Task.Run(async () =>
1920
1920
loggingFunction ( false , "Merging in existing Attribute & Material Data..." ) ;
1921
1921
1922
1922
XivMdl ogMdl = null ;
1923
- if ( options . EnableShapeData && ! ttModel . HasShapeData )
1923
+
1924
+ // Load the original model if we're actually going to need it.
1925
+ var mod = await modding . TryGetModEntry ( mdlPath ) ;
1926
+ if ( mod != null )
1924
1927
{
1925
- // Load the original model if we're actually going to need it.
1926
- var mod = await modding . TryGetModEntry ( mdlPath ) ;
1927
- if ( mod != null )
1928
- {
1929
- loggingFunction ( false , "Loading original SE model to retrieve Shape Data..." ) ;
1930
- var ogOffset = mod . data . originalOffset ;
1931
- ogMdl = await GetRawMdlData ( item , IOUtil . GetRaceFromPath ( mdlPath ) , submeshId , true ) ;
1932
- }
1928
+ loggingFunction ( false , "Loading original SE model..." ) ;
1929
+ var ogOffset = mod . data . originalOffset ;
1930
+ ogMdl = await GetRawMdlData ( item , IOUtil . GetRaceFromPath ( mdlPath ) , submeshId , true ) ;
1931
+ } else
1932
+ {
1933
+ ogMdl = currentMdl ;
1933
1934
}
1934
1935
1935
1936
// Apply our Model Modifier options to the model.
@@ -1942,7 +1943,7 @@ await Task.Run(async () =>
1942
1943
loggingFunction ( false , "Waiting on user..." ) ;
1943
1944
1944
1945
// Bool says whether or not we should continue.
1945
- var oldModel = TTModel . FromRaw ( currentMdl ) ;
1946
+ var oldModel = TTModel . FromRaw ( ogMdl ) ;
1946
1947
bool cont = await intermediaryFunction ( ttModel , oldModel ) ;
1947
1948
if ( ! cont )
1948
1949
{
0 commit comments