[Bf-blender-cvs] [500fd30dac6] temp-lineart-contained: Merge branch 'master' into temp-lineart-contained

[YimingWu]

Commit: 500fd30dac64631c1487161800f973acbb470d1c
Author: YimingWu
Date:   Tue Jul 20 13:50:42 2021 +0800
Branches: temp-lineart-contained
https://developer.blender.org/rB500fd30dac64631c1487161800f973acbb470d1c

Merge branch 'master' into temp-lineart-contained

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



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

diff --cc source/blender/gpencil_modifiers/intern/MOD_gpencillineart.c
index 0a64dfbe20c,bc6a9e53f11..0c0ecd949f6
--- a/source/blender/gpencil_modifiers/intern/MOD_gpencillineart.c
+++ b/source/blender/gpencil_modifiers/intern/MOD_gpencillineart.c
@@@ -410,23 -385,12 +410,22 @@@ static void options_panel_draw(const bC
      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(layout, ptr, "overscan", 0, NULL, ICON_NONE);
  
 -  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, "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_loose_as_contour", 0, IFACE_("Loose 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_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)
@@@ -643,8 -577,8 +642,9 @@@ static void chaining_panel_draw(const b
    uiLayout *col = uiLayoutColumnWithHeading(layout, true, IFACE_("Chain"));
    uiItemR(col, ptr, "use_fuzzy_intersections", 0, NULL, ICON_NONE);
    uiItemR(col, ptr, "use_fuzzy_all", 0, NULL, ICON_NONE);
 +
    uiItemR(col, ptr, "use_loose_edge_chain", 0, IFACE_("Loose Edges"), ICON_NONE);
 -  uiItemR(col, ptr, "use_loose_as_contour", 0, NULL, ICON_NONE);
++  uiItemR(col, ptr, "use_loose_as_contour", 0, IFACE_("Loose Edges As Contour"), ICON_NONE);
    uiItemR(col, ptr, "use_geometry_space_chain", 0, IFACE_("Geometry Space"), ICON_NONE);
  
    uiItemR(layout,