Skip to content

Commit

Permalink
- fixed: Accidentally committed in-progress work... again
Browse files Browse the repository at this point in the history
Partial Revert "- fixed: Made shader targets not case sensitive"

This reverts commit 2c24d2e.
  • Loading branch information
Rachael Alexanderson committed Nov 19, 2017
1 parent 2c24d2e commit 351de94
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 9 deletions.
9 changes: 1 addition & 8 deletions src/gl/renderer/gl_renderstate.cpp
Expand Up @@ -143,12 +143,6 @@ bool FRenderState::ApplyShader()
}
}

if (!activeShader)
{
assert(0); // We should not be getting to this point!
return false;
}

glVertexAttrib4fv(VATTR_COLOR, mColor.vec);
glVertexAttrib4fv(VATTR_NORMAL, mNormal.vec);
//activeShader->muObjectColor2.Set(mObjectColor2);
Expand Down Expand Up @@ -373,8 +367,7 @@ void FRenderState::ApplyLightIndex(int index)
{
index = GLRenderer->mLights->BindUBO(index);
}
if (activeShader)
activeShader->muLightIndex.Set(index);
activeShader->muLightIndex.Set(index);
}
}

Expand Down
1 change: 0 additions & 1 deletion src/gl/shaders/gl_shader.cpp
Expand Up @@ -682,7 +682,6 @@ void gl_ParseHardwareShader(FScanner &sc, int deflump)

PostProcessShader shaderdesc;
shaderdesc.Target = sc.String;
shaderdesc.Target.ToLower();

bool validTarget = false;
if (sc.Compare("beforebloom")) validTarget = true;
Expand Down

0 comments on commit 351de94

Please sign in to comment.