Conflicts:
	Engine/source/gfx/gfxCubemap.h
	Engine/source/gfx/gl/gfxGLStateBlock.cpp
	Engine/source/gfx/sim/cubemapData.cpp
	Engine/source/lighting/advanced/hlsl/advancedLightingFeaturesHLSL.cpp
	Engine/source/materials/materialDefinition.cpp
	Engine/source/materials/materialDefinition.h
	Engine/source/renderInstance/renderDeferredMgr.cpp
	Engine/source/renderInstance/renderImposterMgr.cpp
	Engine/source/shaderGen/HLSL/shaderFeatureHLSL.cpp
	Engine/source/terrain/terrCellMaterial.cpp
	Engine/source/ts/collada/colladaAppMaterial.cpp
	Engine/source/ts/collada/colladaAppMaterial.h
	Templates/Full/game/core/scripts/client/postFx/GammaPostFX.cs
	Templates/Full/game/shaders/common/cubemapSaveV.hlsl
	Templates/Full/game/shaders/common/lighting/advanced/deferredShadingP.hlsl
	Templates/Full/game/shaders/common/particlesP.hlsl
	Templates/Full/game/shaders/common/postFx/fogP.hlsl
	Templates/Full/game/shaders/common/postFx/ssao/SSAO_Blur_P.hlsl
	Templates/Full/game/shaders/common/postFx/ssao/SSAO_P.hlsl
	Templates/Full/game/shaders/common/shaderModelAutoGen.hlsl
	Templates/Full/game/shaders/common/water/gl/waterBasicP.glsl
	Templates/Full/game/shaders/common/water/gl/waterP.glsl
	Templates/Full/game/shaders/common/water/waterBasicP.hlsl
	Templates/Full/game/shaders/common/water/waterP.hlsl
	Tools/CMake/torque3d.cmake