[Bf-blender-cvs] [9e1aec6] temp_viewport_fx_merge: Some compilation fixes after merge

[Antony Riakiotakis]

Commit: 9e1aec6c633bad3daf43d63cc6522a1a82ff855c
Author: Antony Riakiotakis
Date:   Wed Apr 1 11:49:50 2015 +0200
Branches: temp_viewport_fx_merge
https://developer.blender.org/rB9e1aec6c633bad3daf43d63cc6522a1a82ff855c

Some compilation fixes after merge

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

M	source/blender/editors/space_view3d/view3d_edit.c
M	source/blender/gpu/intern/gpu_basic.c
M	source/blender/gpu/intern/gpu_font.c
M	source/blender/gpu/intern/gpu_pixels.c
M	source/blender/gpu/intern/gpu_raster.c

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

diff --git a/source/blender/editors/space_view3d/view3d_edit.c b/source/blender/editors/space_view3d/view3d_edit.c
index 1951bdb..1b0ee23 100644
--- a/source/blender/editors/space_view3d/view3d_edit.c
+++ b/source/blender/editors/space_view3d/view3d_edit.c
@@ -80,7 +80,6 @@
 
 #include "view3d_intern.h"  /* own include */
 
-<<<<<<< HEAD
 #include "GPU_matrix.h"
 
 bool ED_view3d_offset_lock_check(const  View3D *v3d, const  RegionView3D *rv3d)
diff --git a/source/blender/gpu/intern/gpu_basic.c b/source/blender/gpu/intern/gpu_basic.c
index 7fec07a..266b217 100644
--- a/source/blender/gpu/intern/gpu_basic.c
+++ b/source/blender/gpu/intern/gpu_basic.c
@@ -205,7 +205,7 @@ static void basic_shader_bind(void)
 		defs_cstring = BLI_dynstr_get_cstring(defs);
 
 		BASIC_SHADER.gpushader[tweaked_options] =
-			GPU_shader_create(vert_cstring, frag_cstring, NULL, defs_cstring);
+			GPU_shader_create(vert_cstring, frag_cstring, NULL, NULL, defs_cstring, 0, 0, 0);
 
 		MEM_freeN(vert_cstring);
 		MEM_freeN(frag_cstring);
diff --git a/source/blender/gpu/intern/gpu_font.c b/source/blender/gpu/intern/gpu_font.c
index 55163b9..01b76dc 100644
--- a/source/blender/gpu/intern/gpu_font.c
+++ b/source/blender/gpu/intern/gpu_font.c
@@ -105,7 +105,7 @@ static void gpu_font_shader(void)
 		defs_cstring = BLI_dynstr_get_cstring(defs);
 
 		FONT_SHADER =
-			GPU_shader_create(vert_cstring, frag_cstring, NULL, defs_cstring);
+			GPU_shader_create(vert_cstring, frag_cstring, NULL, NULL, defs_cstring, 0, 0, 0);
 
 		MEM_freeN(vert_cstring);
 		MEM_freeN(frag_cstring);
diff --git a/source/blender/gpu/intern/gpu_pixels.c b/source/blender/gpu/intern/gpu_pixels.c
index c666c00..44051e0 100644
--- a/source/blender/gpu/intern/gpu_pixels.c
+++ b/source/blender/gpu/intern/gpu_pixels.c
@@ -325,7 +325,7 @@ static void gpu_pixels_shader(void)
 		defs_cstring = BLI_dynstr_get_cstring(defs);
 
 		PIXELS_SHADER =
-			GPU_shader_create(vert_cstring, frag_cstring, NULL, defs_cstring);
+			GPU_shader_create(vert_cstring, frag_cstring, NULL, NULL, defs_cstring, 0, 0, 0);
 
 		MEM_freeN(vert_cstring);
 		MEM_freeN(frag_cstring);
diff --git a/source/blender/gpu/intern/gpu_raster.c b/source/blender/gpu/intern/gpu_raster.c
index 4879411..24fc6f7 100644
--- a/source/blender/gpu/intern/gpu_raster.c
+++ b/source/blender/gpu/intern/gpu_raster.c
@@ -284,7 +284,7 @@ static void raster_shader_bind(void)
 		defs_cstring = BLI_dynstr_get_cstring(defs);
 
 		RASTER.gpushader[tweaked_options] =
-			GPU_shader_create(vert_cstring, frag_cstring, NULL, defs_cstring);
+			GPU_shader_create(vert_cstring, frag_cstring, NULL, NULL, defs_cstring, 0, 0, 0);
 
 		MEM_freeN(vert_cstring);
 		MEM_freeN(frag_cstring);