Correct merge conflict
authorCampbell Barton <ideasman42@gmail.com>
Tue, 11 Sep 2018 07:47:30 +0000 (17:47 +1000)
committerCampbell Barton <ideasman42@gmail.com>
Tue, 11 Sep 2018 07:47:30 +0000 (17:47 +1000)
release/scripts/startup/bl_ui/properties_grease_pencil_common.py

index 415f8a5fd8d1fa5c5a80d9fd6d630b141a14edab..71688fc7c657cd9ad565e68f6921352769165d98 100644 (file)
@@ -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)