Merge branch 'LinuxCompatabilityFixes' of https://github.com/Bloodknight/Torque3D into development

Templates/BaseGame/game/core/shaders/postFX/fxaa/fxaaV.hlsl

@@ -21,7 +21,7 @@
 //-----------------------------------------------------------------------------
 
 #include "./../../torque.hlsl"
-#include "./../postFX.hlsl"
+#include "./../postFx.hlsl"
 
 struct VertToPix
 {

Templates/BaseGame/game/core/shaders/postFX/ssao/SSAO_Blur_P.hlsl

@@ -20,7 +20,7 @@
 // IN THE SOFTWARE.
 //-----------------------------------------------------------------------------
 
-#include "../../ShaderModelAutoGen.hlsl"
+#include "../../shaderModelAutoGen.hlsl"
 #include "./../postFx.hlsl"
 
 TORQUE_UNIFORM_SAMPLER2D(occludeMap, 0);

Templates/BaseGame/game/core/shaders/postFX/ssao/SSAO_P.hlsl

@@ -20,7 +20,7 @@
 // IN THE SOFTWARE.
 //-----------------------------------------------------------------------------
 
-#include "../../ShaderModelAutoGen.hlsl"
+#include "../../shaderModelAutoGen.hlsl"
 #include "./../postFx.hlsl"
 
 #define DOSMALL

Templates/Full/game/art/shapes/weapons/Grenade/materials.cs

@@ -49,11 +49,11 @@ singleton Material(debri_debris)
 {
    mapTo = "debris";
    diffuseColor[0] = "0.7 0.7 0.7 1";
-   diffuseMap[0] = "rock_diffuse.dds";
-   normalMap[0] = "rock_normals.dds";
+   diffuseMap[0] = "rock_d";
+   normalMap[0] = "rock_n";
+   specularMap[0] = "rock_s";
    specular[0] = "1 1 1 0";
-   specularPower[0] = "50";
-   specularMap[0] = "rock_specular.dds";
+   specularPower[0] = "50";   
    castShadows = "0";
    translucentBlendOp = "None";
    materialTag0 = "Weapon";

Templates/Full/game/shaders/common/postFx/fxaa/fxaaV.hlsl

@@ -21,7 +21,7 @@
 //-----------------------------------------------------------------------------
 
 #include "./../../torque.hlsl"
-#include "./../postFX.hlsl"
+#include "./../postFx.hlsl"
 
 struct VertToPix
 {

Templates/Full/game/shaders/common/postFx/ssao/SSAO_Blur_P.hlsl

@@ -20,7 +20,7 @@
 // IN THE SOFTWARE.
 //-----------------------------------------------------------------------------
 
-#include "../../ShaderModelAutoGen.hlsl"
+#include "../../shaderModelAutoGen.hlsl"
 #include "./../postFx.hlsl"
 
 TORQUE_UNIFORM_SAMPLER2D(occludeMap, 0);

Templates/Full/game/shaders/common/postFx/ssao/SSAO_P.hlsl

@@ -20,7 +20,7 @@
 // IN THE SOFTWARE.
 //-----------------------------------------------------------------------------
 
-#include "../../ShaderModelAutoGen.hlsl"
+#include "../../shaderModelAutoGen.hlsl"
 #include "./../postFx.hlsl"
 
 #define DOSMALL

Templates/Modules/FPSGameplay/art/shapes/weapons/Grenade/materials.cs

@@ -49,11 +49,11 @@ singleton Material(debri_debris)
 {
    mapTo = "debris";
    diffuseColor[0] = "0.7 0.7 0.7 1";
-   diffuseMap[0] = "rock_diffuse.dds";
-   normalMap[0] = "rock_normals.dds";
+   diffuseMap[0] = "rock_d";
+   normalMap[0] = "rock_n";
+   specularMap[0] = "rock_s";
    specular[0] = "1 1 1 0";
-   specularPower[0] = "50";
-   specularMap[0] = "rock_specular.dds";
+   specularPower[0] = "50";   
    castShadows = "0";
    translucentBlendOp = "None";
    materialTag0 = "Weapon";