summaryrefslogtreecommitdiff
path: root/drivers/gles1/rasterizer_gles1.cpp
diff options
context:
space:
mode:
authorJuan Linietsky <reduzio@gmail.com>2014-04-14 22:43:44 -0300
committerJuan Linietsky <reduzio@gmail.com>2014-04-14 22:43:44 -0300
commitec4ef2d2e794819548d731f93728266d31261d71 (patch)
tree6c2940a9029d07a22288c93684dac19cc39de7ed /drivers/gles1/rasterizer_gles1.cpp
parent162d2ebe4f1a6da2da62ad45c4cbfb161157d31d (diff)
-Added google play services (needed for some stuff)
-Added new screen resizing options, stretch_2d is removed, new much more flexible ones. -Fixed bug in viewport (can create more instances in 3d-in-2d demo now) -Can set android permissions and screen sizes manually in the export settings -Changed export templates extension to .tpz (too many people unzipped the manually..) -File dialog now ensures that the proper extension is used (will not allow to save without it) -Fixed bug that made collision exceptions not work in 2D
Diffstat (limited to 'drivers/gles1/rasterizer_gles1.cpp')
-rw-r--r--drivers/gles1/rasterizer_gles1.cpp6
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/gles1/rasterizer_gles1.cpp b/drivers/gles1/rasterizer_gles1.cpp
index f763a60abb..3ffebd4703 100644
--- a/drivers/gles1/rasterizer_gles1.cpp
+++ b/drivers/gles1/rasterizer_gles1.cpp
@@ -4602,6 +4602,12 @@ void RasterizerGLES1::canvas_begin() {
}
+
+void RasterizerGLES1::canvas_disable_blending() {
+
+ glDisable(GL_BLEND);
+}
+
void RasterizerGLES1::canvas_set_opacity(float p_opacity) {
canvas_opacity = p_opacity;