diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2018-09-06 12:35:40 +0300 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2018-09-06 12:35:40 +0300 |
| commit | 28c363aa0beb5f9d38116dbc79e601b84e9e48e3 (patch) | |
| tree | 985eb8b8c85efdaacec057a7c403db25a3608c57 /source/blender/editors/space_node | |
| parent | 79e8805a9e880cba15d5f19dd4345b7c462c884c (diff) | |
Fix bad conflict resolution
Diffstat (limited to 'source/blender/editors/space_node')
| -rw-r--r-- | source/blender/editors/space_node/drawnode.c | 1 |
1 files changed, 0 insertions, 1 deletions
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); |