mirror of https://github.com/AxioDL/metaforce.git
Fix merge derp
This commit is contained in:
parent
8e98a5b058
commit
5d0c1b1d48
|
@ -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;
|
||||||
|
|
Loading…
Reference in New Issue