Added support for shader technique inheritance

Data/Raw/Editor/Includes/LineGizmo.bslinc

@@ -3,7 +3,7 @@ Parameters =
 	mat4x4		matViewProj;
 };
 
-Technique =
+Technique : base("LineGizmo") =
 {
 	Language = "HLSL11";
 	
@@ -34,7 +34,7 @@ Technique =
 	};
 };
 
-Technique =
+Technique : base("LineGizmo") =
 {
 	Language = "HLSL9";
 	
@@ -65,7 +65,7 @@ Technique =
 	};
 };
 
-Technique =
+Technique : base("LineGizmo") =
 {
 	Language = "GLSL";
 	

Data/Raw/Editor/Includes/PickingAlphaCull.bslinc

@@ -9,7 +9,7 @@ Parameters =
 	Texture2D 	mainTexture;	
 };
 
-Technique =
+Technique : base("PickingAlphaCull") =
 {
 	Language = "HLSL11";
 	
@@ -54,7 +54,7 @@ Technique =
 	};
 };
 
-Technique =
+Technique : base("PickingAlphaCull") =
 {
 	Language = "HLSL9";
 	
@@ -98,7 +98,7 @@ Technique =
 	};
 };
 
-Technique =
+Technique : base("PickingAlphaCull") =
 {
 	Language = "GLSL";
 	

Data/Raw/Editor/Includes/PickingCull.bslinc

@@ -5,7 +5,7 @@ Parameters =
 	float4		colorIndex;	
 };
 
-Technique =
+Technique : base("PickingCull") =
 {
 	Language = "HLSL11";
 	
@@ -37,7 +37,7 @@ Technique =
 	};
 };
 
-Technique =
+Technique : base("PickingCull") =
 {
 	Language = "HLSL9";
 	
@@ -69,7 +69,7 @@ Technique =
 	};
 };
 
-Technique =
+Technique : base("PickingCull") =
 {
 	Language = "GLSL";
 	

Data/Raw/Editor/Includes/SolidGizmo.bslinc

@@ -4,7 +4,7 @@ Parameters =
 	float4		viewDir;
 };
 
-Technique =
+Technique : base("SolidGizmo") =
 {
 	Language = "HLSL11";
 	
@@ -43,7 +43,7 @@ Technique =
 	};
 };
 
-Technique =
+Technique : base("SolidGizmo") =
 {
 	Language = "HLSL9";
 	
@@ -82,7 +82,7 @@ Technique =
 	};
 };
 
-Technique =
+Technique : base("SolidGizmo") =
 {
 	Language = "GLSL";
 	

Data/Raw/Editor/Shaders/LineGizmo.bsl

@@ -1,6 +1,6 @@
 #include "$EDITOR$/LineGizmo.bslinc"
 
-Technique =
+Technique : inherits("LineGizmo") =
 {
 	Language = "HLSL11";
 	
@@ -17,7 +17,7 @@ Technique =
 	};
 };
 
-Technique =
+Technique : inherits("LineGizmo") =
 {
 	Language = "HLSL9";
 	
@@ -34,7 +34,7 @@ Technique =
 	};
 };
 
-Technique =
+Technique : inherits("LineGizmo") =
 {
 	Language = "GLSL";
 	

Data/Raw/Editor/Shaders/LineHandle.bsl

@@ -1,6 +1,6 @@
 #include "$EDITOR$/LineGizmo.bslinc"
 
-Technique =
+Technique : inherits("LineGizmo") =
 {
 	Language = "HLSL11";
 	
@@ -21,7 +21,7 @@ Technique =
 	};
 };
 
-Technique =
+Technique : inherits("LineGizmo") =
 {
 	Language = "HLSL9";
 	
@@ -42,7 +42,7 @@ Technique =
 	};
 };
 
-Technique =
+Technique : inherits("LineGizmo") =
 {
 	Language = "GLSL";
 	

Data/Raw/Editor/Shaders/PickingAlphaCullCCW.bsl

@@ -1,6 +1,6 @@
 #include "$EDITOR$/PickingAlphaCull.bslinc"
 
-Technique =
+Technique : inherits("PickingAlphaCull") =
 {
 	Language = "HLSL11";
 	
@@ -10,7 +10,7 @@ Technique =
 	};
 };
 
-Technique =
+Technique : inherits("PickingAlphaCull") =
 {
 	Language = "HLSL9";
 	
@@ -20,7 +20,7 @@ Technique =
 	};
 };
 
-Technique =
+Technique : inherits("PickingAlphaCull") =
 {
 	Language = "GLSL";
 	

Data/Raw/Editor/Shaders/PickingAlphaCullCW.bsl

@@ -1,6 +1,6 @@
 #include "$EDITOR$/PickingAlphaCull.bslinc"
 
-Technique =
+Technique : inherits("PickingAlphaCull") =
 {
 	Language = "HLSL11";
 	
@@ -10,7 +10,7 @@ Technique =
 	};
 };
 
-Technique =
+Technique : inherits("PickingAlphaCull") =
 {
 	Language = "HLSL9";
 	
@@ -20,7 +20,7 @@ Technique =
 	};
 };
 
-Technique =
+Technique : inherits("PickingAlphaCull") =
 {
 	Language = "GLSL";
 	

Data/Raw/Editor/Shaders/PickingAlphaCullNone.bsl

@@ -1,6 +1,6 @@
 #include "$EDITOR$/PickingAlphaCull.bslinc"
 
-Technique =
+Technique : inherits("PickingAlphaCull") =
 {
 	Language = "HLSL11";
 	
@@ -10,7 +10,7 @@ Technique =
 	};
 };
 
-Technique =
+Technique : inherits("PickingAlphaCull") =
 {
 	Language = "HLSL9";
 	
@@ -20,7 +20,7 @@ Technique =
 	};
 };
 
-Technique =
+Technique : inherits("PickingAlphaCull") =
 {
 	Language = "GLSL";
 	

Data/Raw/Editor/Shaders/PickingCullCCW.bsl

@@ -1,6 +1,6 @@
 #include "$EDITOR$/PickingCull.bslinc"
 
-Technique =
+Technique : inherits("PickingCull") =
 {
 	Language = "HLSL11";
 	
@@ -10,7 +10,7 @@ Technique =
 	};
 };
 
-Technique =
+Technique : inherits("PickingCull") =
 {
 	Language = "HLSL9";
 	
@@ -20,7 +20,7 @@ Technique =
 	};
 };
 
-Technique =
+Technique : inherits("PickingCull") =
 {
 	Language = "GLSL";
 	

Data/Raw/Editor/Shaders/PickingCullCW.bsl

@@ -1,6 +1,6 @@
 #include "$EDITOR$/PickingCull.bslinc"
 
-Technique =
+Technique : inherits("PickingCull") =
 {
 	Language = "HLSL11";
 	
@@ -10,7 +10,7 @@ Technique =
 	};
 };
 
-Technique =
+Technique : inherits("PickingCull") =
 {
 	Language = "HLSL9";
 	
@@ -20,7 +20,7 @@ Technique =
 	};
 };
 
-Technique =
+Technique : inherits("PickingCull") =
 {
 	Language = "GLSL";
 	

Data/Raw/Editor/Shaders/PickingCullNone.bsl

@@ -1,6 +1,6 @@
 #include "$EDITOR$/PickingCull.bslinc"
 
-Technique =
+Technique : inherits("PickingCull") =
 {
 	Language = "HLSL11";
 	
@@ -10,7 +10,7 @@ Technique =
 	};
 };
 
-Technique =
+Technique : inherits("PickingCull") =
 {
 	Language = "HLSL9";
 	
@@ -20,7 +20,7 @@ Technique =
 	};
 };
 
-Technique =
+Technique : inherits("PickingCull") =
 {
 	Language = "GLSL";
 	

Data/Raw/Editor/Shaders/SolidGizmo.bsl

@@ -1 +1,16 @@
-#include "$EDITOR$/SolidGizmo.bslinc"
+#include "$EDITOR$/SolidGizmo.bslinc"
+
+Technique : inherits("SolidGizmo") =
+{
+	Language = "HLSL11";
+};
+
+Technique : inherits("SolidGizmo") =
+{
+	Language = "HLSL9";
+};
+
+Technique : inherits("SolidGizmo") =
+{
+	Language = "GLSL";
+};

Data/Raw/Editor/Shaders/SolidHandle.bsl

@@ -1,7 +1,7 @@
 #include "$EDITOR$/SolidGizmo.bslinc"
 Priority = 10;
 
-Technique =
+Technique : inherits("SolidGizmo") =
 {
 	Language = "HLSL11";
 	
@@ -20,7 +20,7 @@ Technique =
 	};
 };
 
-Technique =
+Technique : inherits("SolidGizmo") =
 {
 	Language = "HLSL9";
 	
@@ -39,7 +39,7 @@ Technique =
 	};
 };
 
-Technique =
+Technique : inherits("SolidGizmo") =
 {
 	Language = "GLSL";
 	

Data/Raw/Engine/Includes/DeferredBasePass.bslinc

@@ -2,13 +2,10 @@
 #include "$ENGINE$\PerCameraData.bslinc"
 #include "$ENGINE$\PerObjectData.bslinc"
 
-#ifdef USE_ANIMATION
-	#include "$ENGINE$\SkinnedVertexInput.bslinc"
-#else
-	#include "$ENGINE$\NormalVertexInput.bslinc"
-#endif
+#include "$ENGINE$\SkinnedVertexInput.bslinc"
+#include "$ENGINE$\NormalVertexInput.bslinc"
 
-Technique =
+Technique : base("DeferredBasePassCommon") =
 {
 	Language = "HLSL11";
 	
@@ -47,7 +44,29 @@ Technique =
 	};
 };
 
-Technique =
+Technique
+ : base("DeferredBasePass")
+ : inherits("GBuffer")
+ : inherits("PerCameraData")
+ : inherits("PerObjectData")
+ : inherits("NormalVertexInput")
+ : inherits("DeferredBasePassCommon") =
+{ 
+	Language = "HLSL11";
+};
+
+Technique
+ : base("DeferredBasePassSkinned")
+ : inherits("GBuffer")
+ : inherits("PerCameraData")
+ : inherits("PerObjectData")
+ : inherits("SkinnedVertexInput")
+ : inherits("DeferredBasePassCommon") =
+{
+	Language = "HLSL11";
+};
+
+Technique : base("DeferredBasePassCommon") =
 {
 	Language = "GLSL";
 	
@@ -82,3 +101,25 @@ Technique =
 		};
 	};
 };
+
+Technique
+ : base("DeferredBasePass")
+ : inherits("GBuffer")
+ : inherits("PerCameraData")
+ : inherits("PerObjectData")
+ : inherits("NormalVertexInput")
+ : inherits("DeferredBasePassCommon") =
+{ 
+	Language = "GLSL";
+};
+
+Technique
+ : base("DeferredBasePassSkinned")
+ : inherits("GBuffer")
+ : inherits("PerCameraData")
+ : inherits("PerObjectData")
+ : inherits("SkinnedVertexInput")
+ : inherits("DeferredBasePassCommon") =
+{
+	Language = "GLSL";
+};

Data/Raw/Engine/Includes/DeferredLightPass.bslinc

@@ -18,7 +18,10 @@ Blocks =
 	Block PerLight : auto("PerLight");
 };
 
-Technique =
+Technique
+ : base("DeferredLightPass")
+ : inherits("GBuffer")
+ : inherits("PerCameraData") =
 {
 	Language = "HLSL11";
 	
@@ -171,7 +174,10 @@ Technique =
 	};
 };
 
-Technique =
+Technique
+ : base("DeferredLightPass")
+ : inherits("GBuffer")
+ : inherits("PerCameraData") =
 {
 	Language = "GLSL";
 	

Data/Raw/Engine/Includes/DeferredPointLightPass.bslinc

@@ -1,6 +1,7 @@
 #include "$ENGINE$\DeferredLightPass.bslinc"
 
-Technique =
+Technique 
+ : inherits("DeferredLightPass") =
 {
 	Language = "HLSL11";
 	
@@ -125,7 +126,8 @@ Technique =
 	};
 };
 
-Technique =
+Technique
+ : inherits("DeferredLightPass") =
 {
 	Language = "GLSL";
 	

Data/Raw/Engine/Includes/GBuffer.bslinc

@@ -1,7 +1,7 @@
-Technique =
+Technique : base("GBuffer") =
 {
 	Language = "HLSL11";
-	
+
 	Pass =
 	{
 		Common = 
@@ -23,10 +23,10 @@ Technique =
 	};
 };
 
-Technique =
+Technique : base("GBuffer") =
 {
 	Language = "GLSL";
-	
+
 	Pass =
 	{
 		Common = 

Data/Raw/Engine/Includes/NormalVertexInput.bslinc

@@ -1,4 +1,4 @@
-Technique =
+Technique : base("NormalVertexInput") =
 {
 	Language = "HLSL11";
 	
@@ -78,7 +78,7 @@ Technique =
 	};
 };
 
-Technique =
+Technique : base("NormalVertexInput") =
 {
 	Language = "GLSL";
 	

Data/Raw/Engine/Includes/PPBase.bslinc

@@ -1,4 +1,4 @@
-Technique =
+Technique : base("PPBase") =
 {
 	Language = "HLSL11";
 	
@@ -37,7 +37,7 @@ Technique =
 	};
 };
 
-Technique =
+Technique : base("PPBase") =
 {
 	Language = "GLSL";
 	

Data/Raw/Engine/Includes/PPTonemapCommon.bslinc

@@ -1,4 +1,4 @@
-Technique =
+Technique : base("PPTonemapCommon") =
 {
 	Language = "HLSL11";
 	
@@ -115,7 +115,7 @@ Technique =
 	};
 };
 
-Technique =
+Technique : base("PPTonemapCommon") =
 {
 	Language = "GLSL";
 	

Data/Raw/Engine/Includes/PPWhiteBalance.bslinc

@@ -1,4 +1,4 @@
-Technique =
+Technique : base("PPWhiteBalance") =
 {
 	Language = "HLSL11";
 	
@@ -208,4 +208,9 @@ Technique =
 			}
 		};
 	};
+};
+
+Technique : base("PPWhiteBalance") =
+{
+	Language = "GLSL";
 };

Data/Raw/Engine/Includes/PerCameraData.bslinc

@@ -26,10 +26,10 @@ Blocks =
 	Block PerCamera : auto("PerCamera");
 };
 
-Technique =
+Technique : base("PerCameraData") =
 {
 	Language = "HLSL11";
-	
+
 	Pass =
 	{
 		Common = 
@@ -51,10 +51,10 @@ Technique =
 	};
 };
 
-Technique =
+Technique : base("PerCameraData") =
 {
 	Language = "GLSL";
-	
+
 	Pass =
 	{
 		Common =