Ancurio
/
mkxp-freebird
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Bitmap: Fix renaming issue in RGSS2 code

This commit is contained in:
Jonas Kulla 2013-12-04 15:53:42 +01:00
parent a817b31e7c
commit 226e860c38
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/bitmap.cpp
View File

@ -537,7 +537,7 @@ void Bitmap::blur()
glState.blendMode.pushSet(BlendNone); glState.blendMode.pushSet(BlendNone);
glState.viewport.pushSet(IntRect(0, 0, width(), height())); glState.viewport.pushSet(IntRect(0, 0, width(), height()));
TEX::bind(p->tex.tex); TEX::bind(p->gl.tex);
FBO::bind(auxTex.fbo, FBO::Draw); FBO::bind(auxTex.fbo, FBO::Draw);
pass1.bind(); pass1.bind();
@ -547,7 +547,7 @@ void Bitmap::blur()
quad.draw(); quad.draw();
TEX::bind(auxTex.tex); TEX::bind(auxTex.tex);
FBO::bind(p->tex.fbo, FBO::Draw); FBO::bind(p->gl.fbo, FBO::Draw);
pass2.bind(); pass2.bind();
pass2.setTexSize(Vec2i(width(), height())); pass2.setTexSize(Vec2i(width(), height()));
@ -654,8 +654,8 @@ void Bitmap::radialBlur(int angle, int divisions)
glState.blendMode.pop(); glState.blendMode.pop();
glState.clearColor.pop(); glState.clearColor.pop();
shState->texPool().release(p->tex); shState->texPool().release(p->gl);
p->tex = newTex; p->gl = newTex;
modified(); modified();
} }