Merged changes in the trunk up to revision 53280.
[blender.git] / source / blender / render / intern / source / shadeoutput.c
index c9c8501a3a47d3bd4007342c1cdd1f382d52043d..003e74bd69a656f56d88518c2243470131018aab 100644 (file)
@@ -1892,7 +1892,7 @@ void shade_lamp_loop(ShadeInput *shi, ShadeResult *shr)
                /* note: shi->mode! */
                if (shi->mode & MA_TRANSP && (shi->mode & (MA_ZTRANSP|MA_RAYTRANSP))) {
                        if (shi->spectra!=0.0f) {
-                               float t = MAX3(shr->spec[0], shr->spec[1], shr->spec[2]);
+                               float t = max_fff(shr->spec[0], shr->spec[1], shr->spec[2]);
                                t *= shi->spectra;
                                if (t>1.0f) t= 1.0f;
                                shi->alpha= (1.0f-t)*shi->alpha+t;