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

[YimingWu]

Commit: ef85fcb2feb6fcbefc2f28d799495f3b81b4ae41
Author: YimingWu
Date:   Tue Jun 29 19:41:23 2021 +0800
Branches: temp-lineart-contained
https://developer.blender.org/rBef85fcb2feb6fcbefc2f28d799495f3b81b4ae41

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

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



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

diff --cc source/blender/gpencil_modifiers/intern/MOD_gpencillineart.c
index 45c1281b4ee,8739747082b..c9eceb4893f
--- a/source/blender/gpencil_modifiers/intern/MOD_gpencillineart.c
+++ b/source/blender/gpencil_modifiers/intern/MOD_gpencillineart.c
@@@ -373,16 -358,7 +373,18 @@@ static void edge_types_panel_draw(cons
      uiItemR(entry, ptr, "crease_threshold", UI_ITEM_R_SLIDER, " ", ICON_NONE);
    }
  
 +  sub = uiLayoutRowWithHeading(col, false, IFACE_("Light Contour"));
 +  uiItemR(sub, ptr, "use_light_contour", 0, "", ICON_NONE);
 +  entry = uiLayoutRow(sub, false);
 +  uiLayoutSetActive(entry, (RNA_boolean_get(ptr, "use_light_contour")) || is_first);
 +  if (use_cache && !is_first) {
 +    uiItemL(entry, IFACE_("Reference Cached"), ICON_INFO);
 +  }
 +  else {
 +    uiItemR(entry, ptr, "light_contour_object", 0, "", ICON_NONE);
 +  }
++
+   uiItemR(layout, ptr, "use_overlap_edge_type_support", 0, IFACE_("Allow Overlap"), ICON_NONE);
  }
  
  static void options_panel_draw(const bContext *UNUSED(C), Panel *panel)
@@@ -403,23 -379,12 +405,22 @@@
      return;
    }
  
 -  uiLayout *col = uiLayoutColumn(layout, true);
 +  uiLayout *row = uiLayoutRowWithHeading(layout, false, IFACE_("Custom Camera"));
 +  uiItemR(row, ptr, "use_custom_camera", 0, "", 0);
 +  uiLayout *subrow = uiLayoutRow(row, true);
 +  uiLayoutSetActive(subrow, RNA_boolean_get(ptr, "use_custom_camera"));
 +  uiLayoutSetPropSep(subrow, true);
 +  uiItemR(subrow, ptr, "source_camera", 0, "", ICON_OBJECT_DATA);
  
 -  uiItemR(col, ptr, "use_remove_doubles", 0, NULL, ICON_NONE);
 -  uiItemR(col, ptr, "use_edge_overlap", 0, IFACE_("Overlapping Edges As Contour"), ICON_NONE);
 -  uiItemR(col, ptr, "use_object_instances", 0, NULL, ICON_NONE);
 -  uiItemR(col, ptr, "use_clip_plane_boundaries", 0, NULL, ICON_NONE);
 +  uiItemR(layout, ptr, "overscan", 0, NULL, ICON_NONE);
 +
 +  uiItemR(layout, ptr, "use_remove_doubles", 0, NULL, ICON_NONE);
 +  uiItemR(layout, ptr, "use_edge_overlap", 0, IFACE_("Overlapping Edges As Contour"), ICON_NONE);
 +  uiItemR(layout, ptr, "use_object_instances", 0, NULL, ICON_NONE);
 +  uiItemR(layout, ptr, "use_clip_plane_boundaries", 0, NULL, ICON_NONE);
-   uiItemR(layout, ptr, "use_overlap_edge_type_support", 0, NULL, ICON_NONE);
 +  uiItemR(layout, ptr, "use_crease_on_smooth", 0, IFACE_("Crease On Smooth"), ICON_NONE);
 +  uiItemR(layout, ptr, "use_crease_on_sharp", 0, IFACE_("Crease On Sharp"), ICON_NONE);
 +  uiItemR(layout, ptr, "use_back_face_culling", 0, NULL, ICON_NONE);
  }
  
  static void style_panel_draw(const bContext *UNUSED(C), Panel *panel)