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

[Antonio Vazquez]

Commit: ca348646a3076f4220947e4005c1897d8e2fe48e
Author: Antonio Vazquez
Date:   Wed Nov 29 16:59:23 2017 +0100
Branches: greasepencil-object
https://developer.blender.org/rBca348646a3076f4220947e4005c1897d8e2fe48e

Fix merge errors

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

M	source/blender/draw/intern/draw_manager.c

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

diff --git a/source/blender/draw/intern/draw_manager.c b/source/blender/draw/intern/draw_manager.c
index c902634ac9d..6b75805ecd7 100644
--- a/source/blender/draw/intern/draw_manager.c
+++ b/source/blender/draw/intern/draw_manager.c
@@ -3098,7 +3098,7 @@ static void drw_engines_enable(const Scene *scene, ViewLayer *view_layer, Render
 	else {
 		/* if gpencil must draw the strokes, but not the object */
 		if (mode == CTX_MODE_OBJECT) {
-			DRW_engines_enable_from_mode(mode);
+			drw_engines_enable_from_mode(mode);
 		}
 	}
 }