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

[Antonio Vazquez]

Commit: 866c4a881dadaa43a3081cece18aee3a09e7220e
Author: Antonio Vazquez
Date:   Mon Nov 6 18:56:55 2017 +0100
Branches: greasepencil-object
https://developer.blender.org/rB866c4a881dadaa43a3081cece18aee3a09e7220e

Fix merge errors

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

M	source/blender/editors/gpencil/gpencil_data.c

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

diff --git a/source/blender/editors/gpencil/gpencil_data.c b/source/blender/editors/gpencil/gpencil_data.c
index 99d747c4563..13f4256da6d 100644
--- a/source/blender/editors/gpencil/gpencil_data.c
+++ b/source/blender/editors/gpencil/gpencil_data.c
@@ -1680,8 +1680,8 @@ static int gpencil_vertex_group_poll(bContext *C)
 	Object *ob = CTX_data_active_object(C);
 
 	if ((ob) && (ob->type == OB_GPENCIL)) {
-		return (!ID_IS_LINKED_DATABLOCK(ob) &&
-			!ID_IS_LINKED_DATABLOCK(ob->data) &&
+		return (!ID_IS_LINKED(ob) &&
+			!ID_IS_LINKED(ob->data) &&
 			ob->defbase.first && 
 			((ob->mode == OB_MODE_GPENCIL_EDIT) || (ob->mode == OB_MODE_GPENCIL_SCULPT)));
 	}