Subversion Repositories eduke32

Rev

Rev 5011 | Show entire file | Regard whitespace | Details | Blame | Last modification | View Log | RSS feed

Rev 5011 Rev 5056
Line 4539... Line 4539...
4539
            material->diffusescale[1] = pth->hicr->scale.y;
4539
            material->diffusescale[1] = pth->hicr->scale.y;
4540
        }
4540
        }
4541
    }
4541
    }
4542
4542
4543
    // Lazily fill in all the textures we need, move this to precaching later
4543
    // Lazily fill in all the textures we need, move this to precaching later
4544
    if (pr_artmapping && polymer_eligible_for_artmap(tilenum, pth)) {
4544
    if (pr_artmapping && !(globalflags & GLOBAL_NO_GL_TILESHADES) && polymer_eligible_for_artmap(tilenum, pth)) {
4545
        if (!prartmaps[tilenum]) {
4545
        if (!prartmaps[tilenum]) {
4546
            char *tilebuffer = (char *)waloff[tilenum];
4546
            char *tilebuffer = (char *)waloff[tilenum];
4547
            char *tempbuffer = (char *)Xmalloc(tilesiz[tilenum].x * tilesiz[tilenum].y);
4547
            char *tempbuffer = (char *)Xmalloc(tilesiz[tilenum].x * tilesiz[tilenum].y);
4548
            int i, j, k;
4548
            int i, j, k;
4549
4549
Line 4720... Line 4720...
4720
    if (pr_normalmapping && material->normalmap)
4720
    if (pr_normalmapping && material->normalmap)
4721
        programbits |= prprogrambits[PR_BIT_NORMAL_MAP].bit;
4721
        programbits |= prprogrambits[PR_BIT_NORMAL_MAP].bit;
4722
4722
4723
    // PR_BIT_ART_MAP
4723
    // PR_BIT_ART_MAP
4724
    if (pr_artmapping && material->artmap &&
4724
    if (pr_artmapping && material->artmap &&
-
 
4725
        !(globalflags & GLOBAL_NO_GL_TILESHADES) &&
4725
        (overridematerial & prprogrambits[PR_BIT_ART_MAP].bit)) {
4726
        (overridematerial & prprogrambits[PR_BIT_ART_MAP].bit)) {
4726
        programbits |= prprogrambits[PR_BIT_ART_MAP].bit;
4727
        programbits |= prprogrambits[PR_BIT_ART_MAP].bit;
4727
    } else
4728
    } else
4728
    // PR_BIT_DIFFUSE_MAP
4729
    // PR_BIT_DIFFUSE_MAP
4729
    if (material->diffusemap) {
4730
    if (material->diffusemap) {