[Bf-blender-cvs] [610829a] framebuffer: Fix building after merge

[Dalai Felinto]

Commit: 610829a6dadd9682b586eedf84b392b1ddef47ac
Author: Dalai Felinto
Date:   Thu Oct 15 11:10:56 2015 -0300
Branches: framebuffer
https://developer.blender.org/rB610829a6dadd9682b586eedf84b392b1ddef47ac

Fix building after merge

===================================================================

M	source/blender/gpu/intern/gpu_extensions.c
M	source/blender/python/intern/gpu_offscreen.c

===================================================================

diff --git a/source/blender/gpu/intern/gpu_extensions.c b/source/blender/gpu/intern/gpu_extensions.c
index 6e7b588..005df4c 100644
--- a/source/blender/gpu/intern/gpu_extensions.c
+++ b/source/blender/gpu/intern/gpu_extensions.c
@@ -1671,10 +1671,10 @@ static void gpu_offscreen_draw_doit(
 	            false,
 	            true,
 	            true,
-	            ofs,
+	            "",
 	            fx,
 	            &fx_settings,
-	            "");
+	            ofs);
 
 	GPU_fx_compositor_destroy(fx);
 	GPU_offscreen_unbind(ofs, true); /* unbind */
diff --git a/source/blender/python/intern/gpu_offscreen.c b/source/blender/python/intern/gpu_offscreen.c
index 9237734..763f231 100644
--- a/source/blender/python/intern/gpu_offscreen.c
+++ b/source/blender/python/intern/gpu_offscreen.c
@@ -376,7 +376,7 @@ static PyObject *pygpu_offscreen_new(PyObject *UNUSED(self), PyObject *args, PyO
 		return NULL;
 	}
 
-	ofs = GPU_offscreen_create(width, height, err_out);
+	ofs = GPU_offscreen_create(width, height, 0, err_out);
 
 	if (ofs == NULL) {
 		PyErr_Format(PyExc_Exception,