Merge branch 'master' into blender2.8
[blender.git] / release / scripts / startup / bl_ui / properties_grease_pencil_common.py
index ded6106c5c35ea150a17eacd273e7993e3244e96..415f8a5fd8d1fa5c5a80d9fd6d630b141a14edab 100644 (file)
@@ -404,8 +404,13 @@ 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)