mirror of
https://github.com/ZDoom/gzdoom.git
synced 2024-11-11 07:12:02 +00:00
- merge error fixed.
This commit is contained in:
parent
a350c43c87
commit
e0039179cb
1 changed files with 1 additions and 1 deletions
|
@ -1710,7 +1710,7 @@ bool D3DTex::CheckWrapping(bool wrapping)
|
||||||
|
|
||||||
bool D3DTex::Create(D3DFB *fb, bool wrapping)
|
bool D3DTex::Create(D3DFB *fb, bool wrapping)
|
||||||
{
|
{
|
||||||
if (SUCCEEDED(fb->D3DDevice->CreateTexture(GameTex->GetWidth(), GameTex->GetHeight(), 1, 0, Format, D3DPOOL_MANAGED, &Tex, NULL)))
|
if (SUCCEEDED(fb->D3DDevice->CreateTexture(mGameTex->GetWidth(), mGameTex->GetHeight(), 1, 0, Format, D3DPOOL_MANAGED, &Tex, NULL)))
|
||||||
{
|
{
|
||||||
return Update();
|
return Update();
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue