From 29fa45b695b3d851a33e76ff5904150f63c231b9 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Tue, 11 Sep 2018 17:47:30 +1000 Subject: [PATCH] Correct merge conflict --- .../scripts/startup/bl_ui/properties_grease_pencil_common.py | 5 ----- 1 file changed, 5 deletions(-) diff --git a/release/scripts/startup/bl_ui/properties_grease_pencil_common.py b/release/scripts/startup/bl_ui/properties_grease_pencil_common.py index 415f8a5fd8d..71688fc7c65 100644 --- a/release/scripts/startup/bl_ui/properties_grease_pencil_common.py +++ b/release/scripts/startup/bl_ui/properties_grease_pencil_common.py @@ -404,13 +404,8 @@ class GPENCIL_MT_pie_settings_palette(Menu): pie = layout.menu_pie() gpd = context.gpencil_data gpl = context.active_gpencil_layer -<<<<<<< HEAD palcolor = None # context.active_gpencil_palettecolor - brush = context.active_gpencil_brush -======= - palcolor = context.active_gpencil_palettecolor # brush = context.active_gpencil_brush ->>>>>>> master is_editmode = bool(gpd and gpd.use_stroke_edit_mode and context.editable_gpencil_strokes)