mirror of
https://github.com/AxioDL/metaforce.git
synced 2025-12-10 20:27:43 +00:00
Fix merge derp
This commit is contained in:
@@ -15,7 +15,6 @@ class CWorldShadowShader
|
|||||||
friend struct CWorldShadowShaderD3DDataBindingFactory;
|
friend struct CWorldShadowShaderD3DDataBindingFactory;
|
||||||
friend struct CWorldShadowShaderMetalDataBindingFactory;
|
friend struct CWorldShadowShaderMetalDataBindingFactory;
|
||||||
|
|
||||||
boo::GraphicsDataToken m_token;
|
|
||||||
boo::ITextureR* m_tex;
|
boo::ITextureR* m_tex;
|
||||||
std::experimental::optional<CTexturedQuadFilter> m_prevQuad;
|
std::experimental::optional<CTexturedQuadFilter> m_prevQuad;
|
||||||
u32 m_w, m_h;
|
u32 m_w, m_h;
|
||||||
|
|||||||
Reference in New Issue
Block a user