From c52731328442cd9443d0c20382327856e0d63152 Mon Sep 17 00:00:00 2001
From: unkown <test@test.test>
Date: Mon, 20 Oct 2014 21:09:41 -0600
Subject: [PATCH] Fixed a crash when ribbons are loaded

---
 .../Empty/game/shaders/common/ribbons/basicRibbonShaderP.hlsl | 2 +-
 .../Empty/game/shaders/common/ribbons/basicRibbonShaderV.hlsl | 2 +-
 Templates/Full/game/art/ribbons/materials.cs                  | 4 ++--
 .../Full/game/shaders/common/ribbons/basicRibbonShaderP.hlsl  | 2 +-
 .../Full/game/shaders/common/ribbons/basicRibbonShaderV.hlsl  | 2 +-
 .../Full/game/shaders/common/ribbons/texRibbonShaderP.hlsl    | 4 ++--
 .../Full/game/shaders/common/ribbons/texRibbonShaderV.hlsl    | 2 +-
 7 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/Templates/Empty/game/shaders/common/ribbons/basicRibbonShaderP.hlsl b/Templates/Empty/game/shaders/common/ribbons/basicRibbonShaderP.hlsl
index 7ce54e3aa..5527f20cc 100644
--- a/Templates/Empty/game/shaders/common/ribbons/basicRibbonShaderP.hlsl
+++ b/Templates/Empty/game/shaders/common/ribbons/basicRibbonShaderP.hlsl
@@ -1,5 +1,5 @@
 #define IN_HLSL
-#include "../common/shdrConsts.h"
+#include "../shdrConsts.h"
  
 struct v2f
 {
diff --git a/Templates/Empty/game/shaders/common/ribbons/basicRibbonShaderV.hlsl b/Templates/Empty/game/shaders/common/ribbons/basicRibbonShaderV.hlsl
index 5fd4ecbc0..933fbc0eb 100644
--- a/Templates/Empty/game/shaders/common/ribbons/basicRibbonShaderV.hlsl
+++ b/Templates/Empty/game/shaders/common/ribbons/basicRibbonShaderV.hlsl
@@ -1,5 +1,5 @@
 #define IN_HLSL
-#include "../common/shdrConsts.h"
+#include "../shdrConsts.h"
  
 struct a2v
 {
diff --git a/Templates/Full/game/art/ribbons/materials.cs b/Templates/Full/game/art/ribbons/materials.cs
index dce3e9cac..a8ebc4a61 100644
--- a/Templates/Full/game/art/ribbons/materials.cs
+++ b/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;
 };
diff --git a/Templates/Full/game/shaders/common/ribbons/basicRibbonShaderP.hlsl b/Templates/Full/game/shaders/common/ribbons/basicRibbonShaderP.hlsl
index 7ce54e3aa..5527f20cc 100644
--- a/Templates/Full/game/shaders/common/ribbons/basicRibbonShaderP.hlsl
+++ b/Templates/Full/game/shaders/common/ribbons/basicRibbonShaderP.hlsl
@@ -1,5 +1,5 @@
 #define IN_HLSL
-#include "../common/shdrConsts.h"
+#include "../shdrConsts.h"
  
 struct v2f
 {
diff --git a/Templates/Full/game/shaders/common/ribbons/basicRibbonShaderV.hlsl b/Templates/Full/game/shaders/common/ribbons/basicRibbonShaderV.hlsl
index 5fd4ecbc0..933fbc0eb 100644
--- a/Templates/Full/game/shaders/common/ribbons/basicRibbonShaderV.hlsl
+++ b/Templates/Full/game/shaders/common/ribbons/basicRibbonShaderV.hlsl
@@ -1,5 +1,5 @@
 #define IN_HLSL
-#include "../common/shdrConsts.h"
+#include "../shdrConsts.h"
  
 struct a2v
 {
diff --git a/Templates/Full/game/shaders/common/ribbons/texRibbonShaderP.hlsl b/Templates/Full/game/shaders/common/ribbons/texRibbonShaderP.hlsl
index a93c6162b..ade2a1899 100644
--- a/Templates/Full/game/shaders/common/ribbons/texRibbonShaderP.hlsl
+++ b/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);
  
diff --git a/Templates/Full/game/shaders/common/ribbons/texRibbonShaderV.hlsl b/Templates/Full/game/shaders/common/ribbons/texRibbonShaderV.hlsl
index 5fd4ecbc0..933fbc0eb 100644
--- a/Templates/Full/game/shaders/common/ribbons/texRibbonShaderV.hlsl
+++ b/Templates/Full/game/shaders/common/ribbons/texRibbonShaderV.hlsl
@@ -1,5 +1,5 @@
 #define IN_HLSL
-#include "../common/shdrConsts.h"
+#include "../shdrConsts.h"
  
 struct a2v
 {