Fixed many issues with q2bsp support, it now works properly.

[xonotic/darkplaces.git] / gl_rmain.c

diff --git a/gl_rmain.c b/gl_rmain.c
index 2c15ac96ec1b2a80bbcf81fd29b011d0887b0bd3..7b074b7e03515022f0285ec9f93365dcd29c351b 100644 (file)
--- a/gl_rmain.c
+++ b/gl_rmain.c
@@ -3400,9 +3400,6 @@ skinframe_t *R_SkinFrame_LoadExternal(const char *name, int textureflags, qboole
        skinframe->fog = NULL;
        skinframe->reflect = NULL;
        skinframe->hasalpha = false;
-       skinframe->q2flags = image_q2flags;
-       skinframe->q2value = image_q2value;
-       skinframe->q2contents = image_q2contents;
        // we could store the q2animname here too
 
        if (ddsbase)
@@ -10664,7 +10661,7 @@ static void R_DrawTextureSurfaceList_Sky(int texturenumsurfaces, const msurface_
        // in Quake3 maps as it causes problems with q3map2 sky tricks,
        // and skymasking also looks very bad when noclipping outside the
        // level, so don't use it then either.
-       if (r_refdef.scene.worldmodel && r_refdef.scene.worldmodel->type == mod_brushq1 && r_q1bsp_skymasking.integer && !r_refdef.viewcache.world_novis && !r_trippy.integer)
+       if (r_refdef.scene.worldmodel && r_refdef.scene.worldmodel->brush.skymasking && r_q1bsp_skymasking.integer && !r_refdef.viewcache.world_novis && !r_trippy.integer)
        {
                R_Mesh_ResetTextureState();
                if (skyrendermasked)