diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2018-09-11 10:47:30 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2018-09-11 10:47:30 +0300 |
| commit | 29fa45b695b3d851a33e76ff5904150f63c231b9 (patch) | |
| tree | b2903e4ab57ca2ca713236a727d195d1a26fbc28 /release | |
| parent | 01e6f09001148313bb1658bad0c2d1341a7821cf (diff) | |
Correct merge conflict
Diffstat (limited to 'release')
| -rw-r--r-- | release/scripts/startup/bl_ui/properties_grease_pencil_common.py | 5 |
1 files changed, 0 insertions, 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) |