diff options
author | Campbell Barton <ideasman42@gmail.com> | 2011-02-20 18:48:01 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2011-02-20 18:48:01 +0300 |
commit | 06aee2ef0e1c810c24b2559838e46045d708b22f (patch) | |
tree | 795408b02937d52440bfcd6fc1aa7a4da8f431d1 /source/blender/gpu/intern/gpu_material.c | |
parent | 8c4e95da48b3b896f012d7a1b7c89841270c40c6 (diff) |
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.
Diffstat (limited to 'source/blender/gpu/intern/gpu_material.c')
-rw-r--r-- | source/blender/gpu/intern/gpu_material.c | 10 |
1 files changed, 5 insertions, 5 deletions
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); } |