Automated merge with https://bitbucket.org/lindenlab/davep-materials

...pp_settings/shaders/class1/deferred/multiPointLightF.glsl

...app_settings/shaders/class1/deferred/multiSpotLightF.glsl

...iew/app_settings/shaders/class1/deferred/pointLightF.glsl

...ew/app_settings/shaders/class1/deferred/softenLightF.glsl

...view/app_settings/shaders/class1/deferred/spotLightF.glsl

...app_settings/shaders/class2/deferred/multiSpotLightF.glsl

...ew/app_settings/shaders/class2/deferred/softenLightF.glsl

...view/app_settings/shaders/class2/deferred/spotLightF.glsl

...wview/app_settings/shaders/class2/deferred/sunLightF.glsl

...w/app_settings/shaders/class2/deferred/sunLightSSAOF.glsl

indra/newview/pipeline.cpp