Improve lighting data recovery when combined with static mesh separation

AssetRipper · Feb 3, 2024 · b6dce67 · b6dce67
1 parent 69f19b7
commit b6dce67
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git a/Source/AssetRipper.Export.UnityProjects/DeletedAssets/DeletedAssetsExportCollection.cs b/Source/AssetRipper.Export.UnityProjects/DeletedAssets/DeletedAssetsExportCollection.cs
@@ -2,6 +2,7 @@
 using AssetRipper.Assets.Collections;
 using AssetRipper.Assets.Export;
 using AssetRipper.Assets.Metadata;
+using AssetRipper.Import.Logging;
 using AssetRipper.IO.Files.SerializedFiles;
 using AssetRipper.Processing;
 
@@ -26,6 +27,7 @@ bool IExportCollection.Contains(IUnityObjectBase asset)
 
 	MetaPtr IExportCollection.CreateExportPointer(IExportContainer container, IUnityObjectBase asset, bool isLocal)
 	{
+		Logger.Warning(LogCategory.Export, $"Deleted asset '{asset.GetBestName()}' was referenced from '{container.File.Name}'");
 		return MetaPtr.CreateMissingReference(asset.ClassID, container.ToExportType(asset.GetType()));
 	}
 

diff --git a/Source/AssetRipper.Export.UnityProjects/Ripper.cs b/Source/AssetRipper.Export.UnityProjects/Ripper.cs
@@ -56,7 +56,6 @@ public static IEnumerable<IAssetProcessor> GetDefaultProcessors(LibraryConfigura
 			}
 			yield return new SceneDefinitionProcessor();
 			yield return new MainAssetProcessor();
-			yield return new LightingDataProcessor();
 			yield return new AnimatorControllerProcessor();
 			yield return new AudioMixerProcessor();
 			yield return new EditorFormatProcessor(settings.BundledAssetsExportMode);
@@ -65,6 +64,7 @@ public static IEnumerable<IAssetProcessor> GetDefaultProcessors(LibraryConfigura
 			{
 				yield return new PrefabOutliningProcessor();
 			}
+			yield return new LightingDataProcessor();//Needs to be after static mesh separation
 			yield return new PrefabProcessor();
 			yield return new SpriteProcessor();
 		}

diff --git a/Source/AssetRipper.Processing/LightingDataProcessor.cs b/Source/AssetRipper.Processing/LightingDataProcessor.cs
@@ -9,7 +9,6 @@
 using AssetRipper.SourceGenerated.Classes.ClassID_1120;
 using AssetRipper.SourceGenerated.Classes.ClassID_157;
 using AssetRipper.SourceGenerated.Classes.ClassID_218;
-using AssetRipper.SourceGenerated.Classes.ClassID_23;
 using AssetRipper.SourceGenerated.Classes.ClassID_25;
 using AssetRipper.SourceGenerated.Classes.ClassID_258;
 using AssetRipper.SourceGenerated.Classes.ClassID_28;