Merge pull request #3 from alphaslime/Ribbon-Implementation-Smallpatch

Fixed a shader related crash and textured ribbon's material

Templates/Empty/game/shaders/common/ribbons/basicRibbonShaderP.hlsl

@@ -1,5 +1,5 @@
 #define IN_HLSL
-#include "../common/shdrConsts.h"
+#include "../shdrConsts.h"
  
 struct v2f
 {

Templates/Empty/game/shaders/common/ribbons/basicRibbonShaderV.hlsl

@@ -1,5 +1,5 @@
 #define IN_HLSL
-#include "../common/shdrConsts.h"
+#include "../shdrConsts.h"
  
 struct a2v
 {

Templates/Full/game/art/ribbons/materials.cs

@@ -53,8 +53,8 @@ singleton CustomMaterial( BasicRibbonMat )
  
 new ShaderData( TexturedRibbonShader )
 {
-   DXVertexShaderFile   = "shaders/common/ribbons/TexturedRibbonShaderV.hlsl";
-   DXPixelShaderFile    = "shaders/common/ribbons/TexturedRibbonShaderP.hlsl";
+   DXVertexShaderFile   = "shaders/common/ribbons/texRibbonShaderV.hlsl";
+   DXPixelShaderFile    = "shaders/common/ribbons/texRibbonShaderP.hlsl";
  
    pixVersion = 2.0;
 };

Templates/Full/game/shaders/common/ribbons/basicRibbonShaderP.hlsl

@@ -1,5 +1,5 @@
 #define IN_HLSL
-#include "../common/shdrConsts.h"
+#include "../shdrConsts.h"
  
 struct v2f
 {

Templates/Full/game/shaders/common/ribbons/basicRibbonShaderV.hlsl

@@ -1,5 +1,5 @@
 #define IN_HLSL
-#include "../common/shdrConsts.h"
+#include "../shdrConsts.h"
  
 struct a2v
 {

Templates/Full/game/shaders/common/ribbons/texRibbonShaderP.hlsl

@@ -1,6 +1,6 @@
 #define IN_HLSL
-#include "../common/shdrConsts.h"
-#include "shaders/common/torque.hlsl"
+#include "../shdrConsts.h"
+#include "../torque.hlsl"
  
 uniform sampler2D ribTex : register(S0);
  

Templates/Full/game/shaders/common/ribbons/texRibbonShaderV.hlsl

@@ -1,5 +1,5 @@
 #define IN_HLSL
-#include "../common/shdrConsts.h"
+#include "../shdrConsts.h"
  
 struct a2v
 {