Update netRadiant source

[voretournament/voretournament.git] / misc / source / netradiant-src / tools / quake3 / q3map2 / light_trace.c

diff --git a/misc/source/netradiant-src/tools/quake3/q3map2/light_trace.c b/misc/source/netradiant-src/tools/quake3/q3map2/light_trace.c
index 84e4ab0eef12c97709e15eec8b606f3326cdfd9b..d0b72d35968ef58d06c7afc82a0630c2a64800fe 100644 (file)
--- a/misc/source/netradiant-src/tools/quake3/q3map2/light_trace.c
+++ b/misc/source/netradiant-src/tools/quake3/q3map2/light_trace.c
@@ -1094,7 +1094,7 @@ static void PopulateWithPicoModel( int castShadows, picoModel_t *model, m4x4_t t
                shader = PicoGetSurfaceShader( surface );
                if( shader == NULL )
                        continue;
-               ti.si = ShaderInfoForShader( PicoGetShaderName( shader ) );
+               ti.si = ShaderInfoForShaderNull( PicoGetShaderName( shader ) );
                if( ti.si == NULL )
                        continue;
                
@@ -1498,6 +1498,10 @@ qboolean TraceTriangle( traceInfo_t *ti, traceTriangle_t *tt, trace_t *trace )
        t = t - floor( t );
        is = s * si->lightImage->width;
        it = t * si->lightImage->height;
+       if(is < 0) is = 0;
+       if(is > si->lightImage->width - 1) is = si->lightImage->width - 1;
+       if(it < 0) it = 0;
+       if(it > si->lightImage->height - 1) it = si->lightImage->height - 1;
        
        /* get pixel */
        pixel = si->lightImage->pixels + 4 * (it * si->lightImage->width + is);