From 5bd1bb4899ee6f12435286403779e5b23325a4d6 Mon Sep 17 00:00:00 2001 From: Brecht Van Lommel Date: Sat, 11 Oct 2008 18:52:36 +0000 Subject: Fix for bug #17809: crash with glsl materials and nodes refresh, didn't attach to the right materials to the lamp. --- source/blender/gpu/intern/gpu_material.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'source/blender/gpu') diff --git a/source/blender/gpu/intern/gpu_material.c b/source/blender/gpu/intern/gpu_material.c index 6dff5802c31..62c3f848284 100644 --- a/source/blender/gpu/intern/gpu_material.c +++ b/source/blender/gpu/intern/gpu_material.c @@ -693,7 +693,7 @@ static void shade_one_light(GPUShadeInput *shi, GPUShadeResult *shr, GPULamp *la shr->spec, &shr->spec); add_user_list(&mat->lamps, lamp); - add_user_list(&lamp->materials, ma); + add_user_list(&lamp->materials, shi->gpumat->ma); return; } @@ -702,7 +702,7 @@ static void shade_one_light(GPUShadeInput *shi, GPUShadeResult *shr, GPULamp *la } else if((G.fileflags & G_FILE_GLSL_NO_SHADOWS) && (lamp->mode & LA_ONLYSHADOW)) { add_user_list(&mat->lamps, lamp); - add_user_list(&lamp->materials, ma); + add_user_list(&lamp->materials, shi->gpumat->ma); return; } else @@ -755,7 +755,7 @@ static void shade_one_light(GPUShadeInput *shi, GPUShadeResult *shr, GPULamp *la } add_user_list(&mat->lamps, lamp); - add_user_list(&lamp->materials, ma); + add_user_list(&lamp->materials, shi->gpumat->ma); } static void material_lights(GPUShadeInput *shi, GPUShadeResult *shr) -- cgit v1.2.3