summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoraap <aap@papnet.eu>2020-08-19 16:53:11 +0200
committeraap <aap@papnet.eu>2020-08-19 16:53:11 +0200
commit895055a3d1538eb10dcb19c182b0a008c26bdce3 (patch)
tree36b6070a2b9d380e63a8f7e31a68aa1c7ef87512
parentneo pipelines; postfx fix (diff)
downloadre3-895055a3d1538eb10dcb19c182b0a008c26bdce3.tar
re3-895055a3d1538eb10dcb19c182b0a008c26bdce3.tar.gz
re3-895055a3d1538eb10dcb19c182b0a008c26bdce3.tar.bz2
re3-895055a3d1538eb10dcb19c182b0a008c26bdce3.tar.lz
re3-895055a3d1538eb10dcb19c182b0a008c26bdce3.tar.xz
re3-895055a3d1538eb10dcb19c182b0a008c26bdce3.tar.zst
re3-895055a3d1538eb10dcb19c182b0a008c26bdce3.zip
Diffstat (limited to '')
-rw-r--r--src/rw/TexRead.cpp5
m---------vendor/librw0
2 files changed, 5 insertions, 0 deletions
diff --git a/src/rw/TexRead.cpp b/src/rw/TexRead.cpp
index 4087029b..0c07b9f5 100644
--- a/src/rw/TexRead.cpp
+++ b/src/rw/TexRead.cpp
@@ -289,6 +289,11 @@ CreateTxdImageForVideoCard()
ConvertingTexturesScreen(i, TXDSTORESIZE, "CVT_MSG");
if (CTxdStore::GetSlot(i) != nil && CStreaming::IsObjectInCdImage(i + STREAM_OFFSET_TXD)) {
+#ifdef FIX_BUGS
+ if(strcmp(CTxdStore::GetTxdName(i), "generic") == 0)
+ continue;
+#endif
+
CStreaming::RequestTxd(i, STREAMFLAGS_KEEP_IN_MEMORY);
CStreaming::RequestModelStream(0);
CStreaming::FlushChannels();
diff --git a/vendor/librw b/vendor/librw
-Subproject a78a02394e4c528a2ade867dfd0ffe04e32ec47
+Subproject 93c246b6b1137dba0cb7ed096b5f6d8ac8e8396