From 93fba1018cf3076ce05f62925f7fe69e788e7967 Mon Sep 17 00:00:00 2001 From: Ivan Avdeev Date: Mon, 29 Nov 2021 09:51:33 -0800 Subject: [PATCH] fix incorrect surface indexing when patching fix #239 --- ref_vk/vk_brush.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/ref_vk/vk_brush.c b/ref_vk/vk_brush.c index f32decdf..6fd22a26 100644 --- a/ref_vk/vk_brush.c +++ b/ref_vk/vk_brush.c @@ -414,11 +414,12 @@ static model_sizes_t computeSizes( const model_t *mod ) { for( int i = 0; i < mod->nummodelsurfaces; ++i) { - const msurface_t *surf = mod->surfaces + mod->firstmodelsurface + i; + const int surface_index = mod->firstmodelsurface + i; + const msurface_t *surf = mod->surfaces + surface_index; sizes.water_surfaces += !!(surf->flags & (SURF_DRAWTURB | SURF_DRAWTURB_QUADS)); - if (!renderableSurface(surf, i)) + if (!renderableSurface(surf, surface_index)) continue; ++sizes.num_surfaces; @@ -467,7 +468,7 @@ static qboolean loadBrushSurfaces( model_sizes_t sizes, const model_t *mod ) { int tex_id = surf->texinfo->texture->gl_texturenum; const xvk_patch_surface_t *const psurf = g_map_entities.patch.surfaces ? g_map_entities.patch.surfaces + surface_index : NULL; - if (!renderableSurface(surf, -1)) + if (!renderableSurface(surf, surface_index)) continue; if (psurf && psurf->flags & Patch_Surface_Texture)