[Bf-blender-cvs] [824ef929f69] greasepencil-object: Fix merge errors

[Antonio Vazquez]

Commit: 824ef929f6976a9a946dbc02ce36675236e3851b
Author: Antonio Vazquez
Date:   Thu Jun 28 17:44:59 2018 +0200
Branches: greasepencil-object
https://developer.blender.org/rB824ef929f6976a9a946dbc02ce36675236e3851b

Fix merge errors

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

M	source/blender/editors/gpencil/drawgpencil.c
M	source/blender/editors/gpencil/gpencil_paint.c

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

diff --git a/source/blender/editors/gpencil/drawgpencil.c b/source/blender/editors/gpencil/drawgpencil.c
index 6b0e92c81e7..50e5d1ac08d 100644
--- a/source/blender/editors/gpencil/drawgpencil.c
+++ b/source/blender/editors/gpencil/drawgpencil.c
@@ -1446,7 +1446,7 @@ void ED_gp_draw_primitives(const bContext *C, tGPDprimitive *tgpi, const int typ
 	tgpw.dflag = dflag;
 
 	/* turn on alpha-blending */
-	GPU_Blend(true);
+	GPU_blend(true);
 	/* calculate parent position */
 	ED_gpencil_parent_location(depsgraph, obact, tgpi->gpd, tgpi->gpl, tgpw.diff_mat);
 	if (tgpi->gpf) {
diff --git a/source/blender/editors/gpencil/gpencil_paint.c b/source/blender/editors/gpencil/gpencil_paint.c
index 75712d99d98..bc69c2533bf 100644
--- a/source/blender/editors/gpencil/gpencil_paint.c
+++ b/source/blender/editors/gpencil/gpencil_paint.c
@@ -2214,7 +2214,7 @@ static void gpencil_draw_eraser(bContext *UNUSED(C), int x, int y, void *p_ptr)
 		immUnbindProgram();
 
 		GPU_blend(false);
-		GP_line_smooth(false);
+		GPU_line_smooth(false);
 	}
 }