From 226e860c3885ec95e0dee6afef48ac8736bf38ff Mon Sep 17 00:00:00 2001 From: Jonas Kulla Date: Wed, 4 Dec 2013 15:53:42 +0100 Subject: [PATCH] Bitmap: Fix renaming issue in RGSS2 code --- src/bitmap.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/bitmap.cpp b/src/bitmap.cpp index b61321e..9c8b160 100644 --- a/src/bitmap.cpp +++ b/src/bitmap.cpp @@ -537,7 +537,7 @@ void Bitmap::blur() glState.blendMode.pushSet(BlendNone); glState.viewport.pushSet(IntRect(0, 0, width(), height())); - TEX::bind(p->tex.tex); + TEX::bind(p->gl.tex); FBO::bind(auxTex.fbo, FBO::Draw); pass1.bind(); @@ -547,7 +547,7 @@ void Bitmap::blur() quad.draw(); TEX::bind(auxTex.tex); - FBO::bind(p->tex.fbo, FBO::Draw); + FBO::bind(p->gl.fbo, FBO::Draw); pass2.bind(); pass2.setTexSize(Vec2i(width(), height())); @@ -654,8 +654,8 @@ void Bitmap::radialBlur(int angle, int divisions) glState.blendMode.pop(); glState.clearColor.pop(); - shState->texPool().release(p->tex); - p->tex = newTex; + shState->texPool().release(p->gl); + p->gl = newTex; modified(); }