diff --git a/src/ObjCommon/Material/JsonMaterial.h.template b/src/ObjCommon/Material/JsonMaterial.h.template index f0eecbd0..b14bf10f 100644 --- a/src/ObjCommon/Material/JsonMaterial.h.template +++ b/src/ObjCommon/Material/JsonMaterial.h.template @@ -510,7 +510,6 @@ namespace GAME #if defined(FEATURE_T6) unsigned surfaceFlags; unsigned contents; - uint8_t probeMipBits; std::optional thermalMaterial; #endif #endif @@ -534,7 +533,6 @@ namespace GAME #if defined(FEATURE_T6) surfaceFlags, contents, - probeMipBits, thermalMaterial, #endif #endif diff --git a/src/ObjLoading/Material/JsonMaterialLoader.cpp.template b/src/ObjLoading/Material/JsonMaterialLoader.cpp.template index d1887d1f..49250488 100644 --- a/src/ObjLoading/Material/JsonMaterialLoader.cpp.template +++ b/src/ObjLoading/Material/JsonMaterialLoader.cpp.template @@ -436,9 +436,6 @@ namespace material.stateFlags = static_cast(jMaterial.stateFlags); material.cameraRegion = jMaterial.cameraRegion; -#if defined(FEATURE_T6) - material.probeMipBits = jMaterial.probeMipBits; -#endif auto* techniqueSet = m_context.LoadDependency(jMaterial.techniqueSet); if (!techniqueSet) diff --git a/src/ObjWriting/Game/T6/Material/DumperMaterialT6.cpp b/src/ObjWriting/Game/T6/Material/DumperMaterialT6.cpp index 9f193037..56e11e97 100644 --- a/src/ObjWriting/Game/T6/Material/DumperMaterialT6.cpp +++ b/src/ObjWriting/Game/T6/Material/DumperMaterialT6.cpp @@ -31,5 +31,6 @@ void AssetDumperMaterial::DumpAsset(AssetDumpingContext& context, XAssetInfoAsset(); assert(material->info.gameFlags < 0x8000); assert(material->info.hashIndex == 0); + assert(material->probeMipBits == 0); DumpMaterialAsJson(*assetFile, *material, context); } diff --git a/src/ObjWriting/Material/JsonMaterialWriter.cpp.template b/src/ObjWriting/Material/JsonMaterialWriter.cpp.template index a29a1cf4..4cce4829 100644 --- a/src/ObjWriting/Material/JsonMaterialWriter.cpp.template +++ b/src/ObjWriting/Material/JsonMaterialWriter.cpp.template @@ -328,9 +328,6 @@ namespace jMaterial.stateFlags = material.stateFlags; jMaterial.cameraRegion = static_cast(material.cameraRegion); -#if defined(FEATURE_T6) - jMaterial.probeMipBits = material.probeMipBits; -#endif if (material.techniqueSet && material.techniqueSet->name) jMaterial.techniqueSet = AssetName(material.techniqueSet->name); diff --git a/test/ObjLoadingTests/Game/T6/Material/LoaderMaterialT6Test.cpp b/test/ObjLoadingTests/Game/T6/Material/LoaderMaterialT6Test.cpp index 2d797315..454054a6 100644 --- a/test/ObjLoadingTests/Game/T6/Material/LoaderMaterialT6Test.cpp +++ b/test/ObjLoadingTests/Game/T6/Material/LoaderMaterialT6Test.cpp @@ -63,7 +63,6 @@ namespace "CASTS_SHADOW" ], "layeredSurfaceTypes": 536870925, - "probeMipBits": 0, "sortKey": 4, "stateBits": [ { diff --git a/test/ObjWritingTests/Game/T6/Material/DumperMaterialT6Test.cpp b/test/ObjWritingTests/Game/T6/Material/DumperMaterialT6Test.cpp index c04e3458..30c83ec1 100644 --- a/test/ObjWritingTests/Game/T6/Material/DumperMaterialT6Test.cpp +++ b/test/ObjWritingTests/Game/T6/Material/DumperMaterialT6Test.cpp @@ -284,7 +284,6 @@ namespace "CASTS_SHADOW" ], "layeredSurfaceTypes": 536870925, - "probeMipBits": 0, "sortKey": 4, "stateBits": [ {