Skip to content

Commit

Permalink
New shader to load
Browse files Browse the repository at this point in the history
  • Loading branch information
DMagic1 committed Oct 29, 2019

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature.
1 parent 1ff1de1 commit d1ab168
Showing 1 changed file with 1 addition and 9 deletions.
10 changes: 1 addition & 9 deletions SCANsat/SCAN_Unity/SCAN_UI_Loader.cs
Original file line number Diff line number Diff line change
@@ -102,7 +102,6 @@ public class SCAN_UI_Loader : MonoBehaviour
private static Sprite _mechJebIcon;

private static Shader _edgeDetectShader;
private static Shader _greyScaleShader;

private static GameObject[] loadedPrefabs;

@@ -320,11 +319,6 @@ public static Shader EdgeDetectShader
get {return _edgeDetectShader;}
}

public static Shader GreyScaleShader
{
get { return _greyScaleShader; }
}

public static void ResetUIStyle()
{
if (loadedPrefabs != null)
@@ -408,10 +402,8 @@ private static void loadShaders()
{
Shader s = loadedShaders[i];

if (s.name == "Hidden/Edge Detect X")
if (s.name == "Hidden/EdgeDetectColors")
_edgeDetectShader = s;
else if (s.name == "Hidden/Grayscale Effect")
_greyScaleShader = s;
}

SCANUtil.SCANlog("Shader asset bundle loaded; using platform bundle: {0}", shaderPath);

0 comments on commit d1ab168

Please sign in to comment.