Fix for bug #17809: crash with glsl materials and nodes refresh,

didn't attach to the right materials to the lamp.
This commit is contained in:
Brecht Van Lommel
2008-10-11 18:52:36 +00:00
parent ec7407f942
commit 5bd1bb4899

View File

@@ -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)