From 06aee2ef0e1c810c24b2559838e46045d708b22f Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Sun, 20 Feb 2011 15:48:01 +0000 Subject: misc warnings/fixes - WITH_OPENJPEG wasn't defined for creator.c with CMake. - remove shadowed/redefined vars. - remove some unused RNA report args. - re-arrange IMB_FILE_TYPES so IRIS is not the first format tested, since its not very common test JPEG and PNG first. --- source/blender/gpu/intern/gpu_material.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'source/blender/gpu/intern') diff --git a/source/blender/gpu/intern/gpu_material.c b/source/blender/gpu/intern/gpu_material.c index c283e2fd907..3dd4ccc2a2f 100644 --- a/source/blender/gpu/intern/gpu_material.c +++ b/source/blender/gpu/intern/gpu_material.c @@ -776,12 +776,12 @@ static void material_lights(GPUShadeInput *shi, GPUShadeResult *shr) ListBase *lb = object_duplilist(shi->gpumat->scene, ob); for(dob=lb->first; dob; dob=dob->next) { - Object *ob = dob->ob; - - if(ob->type==OB_LAMP) { - copy_m4_m4(ob->obmat, dob->mat); + Object *ob_iter = dob->ob; + + if(ob_iter->type==OB_LAMP) { + copy_m4_m4(ob_iter->obmat, dob->mat); - lamp = GPU_lamp_from_blender(shi->gpumat->scene, ob, base->object); + lamp = GPU_lamp_from_blender(shi->gpumat->scene, ob_iter, ob); if(lamp) shade_one_light(shi, shr, lamp); } -- cgit v1.2.3