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

[YimingWu]

Commit: 75c9ea0cab0eac1b39e257b070067f05a36d06d7
Author: YimingWu
Date:   Mon Jun 28 13:26:55 2021 +0800
Branches: temp-lineart-contained
https://developer.blender.org/rB75c9ea0cab0eac1b39e257b070067f05a36d06d7

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

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



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

diff --cc source/blender/gpencil_modifiers/intern/MOD_gpencillineart.c
index 403da5e22ff,b87ed9e431a..2af3f66eb75
--- a/source/blender/gpencil_modifiers/intern/MOD_gpencillineart.c
+++ b/source/blender/gpencil_modifiers/intern/MOD_gpencillineart.c
@@@ -403,22 -363,13 +403,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(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(col, ptr, "allow_overlap_edge_types", 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_multiple_edge_types", 0, NULL, ICON_NONE);
++  uiItemR(layout, ptr, "allow_overlap_edge_types", 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);
  }
  
  static void style_panel_draw(const bContext *UNUSED(C), Panel *panel)
@@@ -741,16 -611,8 +741,14 @@@ static void panelRegister(ARegionType *
                                       transparency_panel_draw_header,
                                       transparency_panel_draw,
                                       occlusion_panel);
 +  gpencil_modifier_subpanel_register(region_type,
 +                                     "intersection",
 +                                     "",
 +                                     intersection_panel_draw_header,
 +                                     intersection_panel_draw,
 +                                     panel_type);
    gpencil_modifier_subpanel_register(
        region_type, "face_mark", "", face_mark_panel_draw_header, face_mark_panel_draw, panel_type);
-   gpencil_modifier_subpanel_register(
-       region_type, "face_mark", "", face_mark_panel_draw_header, face_mark_panel_draw, panel_type);
    gpencil_modifier_subpanel_register(
        region_type, "chaining", "Chaining", NULL, chaining_panel_draw, panel_type);
    gpencil_modifier_subpanel_register(
diff --cc source/blender/makesrna/intern/rna_gpencil_modifier.c
index 96bdd5546f2,6fd897a3d66..212237c2985
--- a/source/blender/makesrna/intern/rna_gpencil_modifier.c
+++ b/source/blender/makesrna/intern/rna_gpencil_modifier.c
@@@ -2882,42 -2869,10 +2882,42 @@@ static void rna_def_modifier_gpencillin
    RNA_def_property_boolean_sdna(prop, NULL, "calculation_flags", LRT_ALLOW_OVERLAP_EDGE_TYPES);
    RNA_def_property_ui_text(prop,
                             "Overlapping Edge Types",
-                            "Allow an edge to have multiple overlapping types. This will create an "
-                            "individual stroke for each overlapping type");
+                            "Allow an edge to have multiple overlapping types. This will create a "
+                            "separate stroke for each overlapping type");
    RNA_def_property_update(prop, 0, "rna_GpencilModifier_update");
  
 +  prop = RNA_def_property(srna, "offset_towards_custom_camera", PROP_BOOLEAN, PROP_NONE);
 +  RNA_def_property_boolean_sdna(prop, NULL, "flags", LRT_GPENCIL_OFFSET_TOWARDS_CUSTOM_CAMERA);
 +  RNA_def_property_ui_text(prop,
 +                           "Offset Towards Custom Camera",
 +                           "Offset strokes towards selected camera instead of the active camera");
 +  RNA_def_property_update(prop, 0, "rna_GpencilModifier_update");
 +
 +  prop = RNA_def_property(srna, "stroke_offset", PROP_FLOAT, PROP_DISTANCE);
 +  RNA_def_property_ui_text(prop,
 +                           "Stroke Offset",
 +                           "Move strokes slightly towards the camera to avoid clipping while "
 +                           "preserve depth for the viewport");
 +  RNA_def_property_ui_range(prop, 0.0f, 0.5f, 0.001f, 4);
 +  RNA_def_property_range(prop, 0.0f, 0.5f);
 +  RNA_def_property_update(prop, NC_SCENE, "rna_GpencilModifier_update");
 +
 +  prop = RNA_def_property(srna, "source_camera", PROP_POINTER, PROP_NONE);
 +  RNA_def_property_flag(prop, PROP_EDITABLE | PROP_ID_SELF_CHECK);
 +  RNA_def_property_struct_type(prop, "Object");
 +  RNA_def_property_override_flag(prop, PROPOVERRIDE_OVERRIDABLE_LIBRARY);
 +  RNA_def_property_ui_text(
 +      prop, "Camera Object", "Use specified camera object for generating line art");
 +  RNA_def_property_update(prop, 0, "rna_GpencilModifier_dependency_update");
 +
 +  prop = RNA_def_property(srna, "light_contour_object", PROP_POINTER, PROP_NONE);
 +  RNA_def_property_flag(prop, PROP_EDITABLE | PROP_ID_SELF_CHECK);
 +  RNA_def_property_struct_type(prop, "Object");
 +  RNA_def_property_override_flag(prop, PROPOVERRIDE_OVERRIDABLE_LIBRARY);
 +  RNA_def_property_ui_text(
 +      prop, "Light Object", "Use this light object to generate light contour");
 +  RNA_def_property_update(prop, 0, "rna_GpencilModifier_dependency_update");
 +
    prop = RNA_def_property(srna, "source_type", PROP_ENUM, PROP_NONE);
    RNA_def_property_enum_items(prop, modifier_lineart_source_type);
    RNA_def_property_ui_text(prop, "Source Type", "Line art stroke source type");