[Bf-blender-cvs] [6810d031dab] temp-lineart-contained: LineArt: Fix merge conflicts.

[YimingWu]

Commit: 6810d031dab03df3842ed59314ed3c6dfdaf7387
Author: YimingWu
Date:   Thu May 6 18:01:07 2021 +0800
Branches: temp-lineart-contained
https://developer.blender.org/rB6810d031dab03df3842ed59314ed3c6dfdaf7387

LineArt: Fix merge conflicts.

===================================================================

M	source/blender/editors/object/object_add.c
M	source/blender/gpencil_modifiers/intern/MOD_gpencilopacity.c

===================================================================

diff --git a/source/blender/editors/object/object_add.c b/source/blender/editors/object/object_add.c
index 9ace7128d87..ea092d2be01 100644
--- a/source/blender/editors/object/object_add.c
+++ b/source/blender/editors/object/object_add.c
@@ -1490,6 +1490,9 @@ void OBJECT_OT_gpencil_add(wmOperatorType *ot)
   /* flags */
   ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO;
 
+  /* ui */
+  ot->ui = object_add_ui;
+
   /* properties */
   ED_object_add_unit_props_radius(ot);
   ED_object_add_generic_props(ot, false);
diff --git a/source/blender/gpencil_modifiers/intern/MOD_gpencilopacity.c b/source/blender/gpencil_modifiers/intern/MOD_gpencilopacity.c
index ae8f302bcea..ea37558fa7f 100644
--- a/source/blender/gpencil_modifiers/intern/MOD_gpencilopacity.c
+++ b/source/blender/gpencil_modifiers/intern/MOD_gpencilopacity.c
@@ -341,8 +341,6 @@ static void panelRegister(ARegionType *region_type)
       region_type, "mask", "Influence", NULL, mask_panel_draw, panel_type);
   gpencil_modifier_subpanel_register(
       region_type, "curve", "", curve_header_draw, curve_panel_draw, mask_panel_type);
-  PanelType *fading_panel_type = gpencil_modifier_subpanel_register(
-      region_type, "fading", "", fading_header_draw, fading_panel_draw, panel_type);
 }
 
 GpencilModifierTypeInfo modifierType_Gpencil_Opacity = {