[Bf-blender-cvs] [6e8b058093d] temp-lineart-contained: Merge remote-tracking branch 'origin/master' into temp-lineart-contained

[YimingWu]

Commit: 6e8b058093d11b1cb7f12c37a1f004ea7b61344a
Author: YimingWu
Date:   Sun Nov 7 12:57:24 2021 +0800
Branches: temp-lineart-contained
https://developer.blender.org/rB6e8b058093d11b1cb7f12c37a1f004ea7b61344a

Merge remote-tracking branch 'origin/master' into temp-lineart-contained

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



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

diff --cc source/blender/gpencil_modifiers/intern/MOD_gpencillineart.c
index 6c9b3cea5ef,b35ebd4be9a..dfcda2b57f7
--- a/source/blender/gpencil_modifiers/intern/MOD_gpencillineart.c
+++ b/source/blender/gpencil_modifiers/intern/MOD_gpencillineart.c
@@@ -600,14 -576,8 +605,11 @@@ static void face_mark_panel_draw(const 
  
    uiLayoutSetActive(layout, use_mark);
  
 -  uiItemR(layout, ptr, "use_face_mark_invert", 0, NULL, ICON_NONE);
 -  uiItemR(layout, ptr, "use_face_mark_boundaries", 0, NULL, ICON_NONE);
 +  if (!use_cache || is_first) {
 +    uiItemR(layout, ptr, "use_face_mark_invert", 0, NULL, ICON_NONE);
 +    uiItemR(layout, ptr, "use_face_mark_boundaries", 0, NULL, ICON_NONE);
 +    uiItemR(layout, ptr, "use_face_mark_keep_contour", 0, NULL, ICON_NONE);
 +  }
-   else {
-     uiItemL(layout, "Cached with the first line art modifier.", ICON_INFO);
-   }
  }
  
  static void chaining_panel_draw(const bContext *UNUSED(C), Panel *panel)