From 2a9e6ef5e62c27b48852fe27e2ce91341b3876e4 Mon Sep 17 00:00:00 2001
From: Daniel Buckmaster <dan.buckmaster@gmail.com>
Date: Wed, 24 Sep 2014 08:27:03 +1000
Subject: [PATCH] Renamed default ribbon datablocks.

---
 Templates/Empty/game/art/ribbons/materials.cs |  6 +++---
 Templates/Empty/game/art/ribbons/ribbons.cs   |  6 +++---
 Templates/Full/game/art/ribbons/materials.cs  | 16 ++++++++--------
 Templates/Full/game/art/ribbons/ribbons.cs    |  8 ++++----
 4 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/Templates/Empty/game/art/ribbons/materials.cs b/Templates/Empty/game/art/ribbons/materials.cs
index a8ee7b19c..d53ada9e2 100644
--- a/Templates/Empty/game/art/ribbons/materials.cs
+++ b/Templates/Empty/game/art/ribbons/materials.cs
@@ -24,7 +24,7 @@
 
 //Basic ribbon shader/////////////////////////////////////////////
  
-new ShaderData( basicRibbonShader )
+new ShaderData( BasicRibbonShader )
 {
    DXVertexShaderFile   = "shaders/common/ribbons/basicRibbonShaderV.hlsl";
    DXPixelShaderFile    = "shaders/common/ribbons/basicRibbonShaderP.hlsl";
@@ -32,9 +32,9 @@ new ShaderData( basicRibbonShader )
    pixVersion = 2.0;
 };
  
-singleton CustomMaterial( basicRibbonMat )
+singleton CustomMaterial( BasicRibbonMat )
 {
-   shader = basicRibbonShader;
+   shader = BasicRibbonShader;
    version = 2.0;
    
    emissive[0] = true;
diff --git a/Templates/Empty/game/art/ribbons/ribbons.cs b/Templates/Empty/game/art/ribbons/ribbons.cs
index ce65e6fe8..b2184b74c 100644
--- a/Templates/Empty/game/art/ribbons/ribbons.cs
+++ b/Templates/Empty/game/art/ribbons/ribbons.cs
@@ -27,7 +27,7 @@ datablock RibbonNodeData(DefaultRibbonNodeData)
 
 //ribbon data////////////////////////////////////////
 
-datablock RibbonData(basicRibbon)
+datablock RibbonData(BasicRibbon)
 {
    size[0] = 0.5;
    color[0] = "1.0 0.0 0.0 1.0";
@@ -40,5 +40,5 @@ datablock RibbonData(basicRibbon)
    RibbonLength = 40;
    fadeAwayStep = 0.1;
    UseFadeOut = true;
-   RibbonMaterial = basicRibbonMat;
-};
\ No newline at end of file
+   RibbonMaterial = BasicRibbonMat;
+};
diff --git a/Templates/Full/game/art/ribbons/materials.cs b/Templates/Full/game/art/ribbons/materials.cs
index f9115356f..dce3e9cac 100644
--- a/Templates/Full/game/art/ribbons/materials.cs
+++ b/Templates/Full/game/art/ribbons/materials.cs
@@ -24,7 +24,7 @@
 
 //Basic ribbon shader/////////////////////////////////////////////
  
-new ShaderData( basicRibbonShader )
+new ShaderData( BasicRibbonShader )
 {
    DXVertexShaderFile   = "shaders/common/ribbons/basicRibbonShaderV.hlsl";
    DXPixelShaderFile    = "shaders/common/ribbons/basicRibbonShaderP.hlsl";
@@ -32,9 +32,9 @@ new ShaderData( basicRibbonShader )
    pixVersion = 2.0;
 };
  
-singleton CustomMaterial( basicRibbonMat )
+singleton CustomMaterial( BasicRibbonMat )
 {
-   shader = basicRibbonShader;
+   shader = BasicRibbonShader;
    version = 2.0;
    
    emissive[0] = true;
@@ -51,17 +51,17 @@ singleton CustomMaterial( basicRibbonMat )
 
 //Texture ribbon shader/////////////////////////////////////////////
  
-new ShaderData( texRibbonShader )
+new ShaderData( TexturedRibbonShader )
 {
-   DXVertexShaderFile   = "shaders/common/ribbons/texRibbonShaderV.hlsl";
-   DXPixelShaderFile    = "shaders/common/ribbons/texRibbonShaderP.hlsl";
+   DXVertexShaderFile   = "shaders/common/ribbons/TexturedRibbonShaderV.hlsl";
+   DXPixelShaderFile    = "shaders/common/ribbons/TexturedRibbonShaderP.hlsl";
  
    pixVersion = 2.0;
 };
  
-singleton CustomMaterial( texRibbonMat )
+singleton CustomMaterial( TexturedRibbonMat )
 {
-   shader = texRibbonShader;
+   shader = TexturedRibbonShader;
    version = 2.0;
    
    emissive[0] = true;
diff --git a/Templates/Full/game/art/ribbons/ribbons.cs b/Templates/Full/game/art/ribbons/ribbons.cs
index aef6204e4..8660ec4d2 100644
--- a/Templates/Full/game/art/ribbons/ribbons.cs
+++ b/Templates/Full/game/art/ribbons/ribbons.cs
@@ -27,7 +27,7 @@ datablock RibbonNodeData(DefaultRibbonNodeData)
 
 //ribbon data////////////////////////////////////////
 
-datablock RibbonData(basicRibbon)
+datablock RibbonData(BasicRibbon)
 {
    size[0] = 0.5;
    color[0] = "1.0 0.0 0.0 1.0";
@@ -40,12 +40,12 @@ datablock RibbonData(basicRibbon)
    RibbonLength = 40;
    fadeAwayStep = 0.1;
    UseFadeOut = true;
-   RibbonMaterial = basicRibbonMat;
+   RibbonMaterial = BasicRibbonMat;
 };
 
-datablock RibbonData(texRibbon)
+datablock RibbonData(TexturedRibbon)
 {
-   RibbonMaterial = texRibbonMat;
+   RibbonMaterial = TexturedRibbonMat;
    size[0] = 0.5;
    color[0] = "1.0 1.0 1.0 1.0";
    position[0] = 0.0;