[Bf-blender-cvs] [28c363aa0be] blender2.8: Fix bad conflict resolution

[Sergey Sharybin]

Commit: 28c363aa0beb5f9d38116dbc79e601b84e9e48e3
Author: Sergey Sharybin
Date:   Thu Sep 6 11:35:40 2018 +0200
Branches: blender2.8
https://developer.blender.org/rB28c363aa0beb5f9d38116dbc79e601b84e9e48e3

Fix bad conflict resolution

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

M	source/blender/editors/space_node/drawnode.c

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

diff --git a/source/blender/editors/space_node/drawnode.c b/source/blender/editors/space_node/drawnode.c
index 2634b3108fa..2f30b260f60 100644
--- a/source/blender/editors/space_node/drawnode.c
+++ b/source/blender/editors/space_node/drawnode.c
@@ -2340,7 +2340,6 @@ static void node_composit_buts_mask(uiLayout *layout, bContext *C, PointerRNA *p
 	bNode *node = ptr->data;
 
 	uiTemplateID(layout, C, ptr, "mask", NULL, NULL, NULL, UI_TEMPLATE_ID_FILTER_ALL, false);
-	uiItemR(layout, ptr, "use_antialiasing", 0, NULL, ICON_NONE);
 	uiItemR(layout, ptr, "use_feather", 0, NULL, ICON_NONE);
 
 	uiItemR(layout, ptr, "size_source", 0, "", ICON_NONE);