fix crash when mme_saveDepth is used without blur

brugal · Jun 10, 2022 · b6a315b · b6a315b
1 parent 378eb02
commit b6a315b
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 10 deletions.
diff --git a/FIXME b/FIXME
@@ -2407,13 +2407,6 @@ Q_GetCpFromUtf8  invalid number of bytes specified in utf8 character 255
 
 * czm*.dm_68 armor/health bug
 
-* since 12.5test9 not in 12.5test7
-
-  renderer_opengl1_x86_64.dll crash
-
-  set mme_savedepth 1
-  video avi wav
-
 
 ----
 

diff --git a/Makefile.local b/Makefile.local
@@ -1,4 +1,4 @@
-VERSION=12.5test24
+VERSION=12.5test25
 
 USE_CODEC_VORBIS=1
 USE_FREETYPE=1

diff --git a/code/renderercommon/inc_tr_init.c b/code/renderercommon/inc_tr_init.c
@@ -853,7 +853,7 @@ const void *RB_TakeVideoFrameCmd (const void *data, shotData_t *shotData)
 		if (mme_depthRange->value > 0) {
 			byte *buffer;
 
-			if (mme_saveDepth->integer == 2) {
+			if (!useBlur  ||  mme_saveDepth->integer == 2) {
 				//FIXME duplicate code in R_MME_GetDepth()
 				float focusStart, focusEnd, focusMul;
 				float zBase, zAdd, zRange;

diff --git a/version.txt b/version.txt
@@ -1,4 +1,4 @@
-12.5test24
+12.5test25
 
 * ioquake3 patches