diff options
author | YimingWu <xp8110@outlook.com> | 2021-03-23 17:15:44 +0300 |
---|---|---|
committer | Sebastian Parborg <darkdefende@gmail.com> | 2021-04-01 13:36:23 +0300 |
commit | e1b2cf887fdbf2897c59dd7d20ea1074f962d3ee (patch) | |
tree | 853b0f2e5e08957e8a59bf6ecd7f4e1cb0735341 /source | |
parent | d5cefc1844cfd679b5d1f134386635f6165ae2e3 (diff) |
LineArt: Remove resampling settings.
This can be done with an other GP modifier already.
Diffstat (limited to 'source')
6 files changed, 1 insertions, 21 deletions
diff --git a/source/blender/gpencil_modifiers/intern/MOD_gpencillineart.c b/source/blender/gpencil_modifiers/intern/MOD_gpencillineart.c index 2bab728f5d8..22ba035be8a 100644 --- a/source/blender/gpencil_modifiers/intern/MOD_gpencillineart.c +++ b/source/blender/gpencil_modifiers/intern/MOD_gpencillineart.c @@ -103,7 +103,6 @@ static void generate_strokes_actual( lmd->transparency_mask, lmd->thickness, lmd->opacity, - lmd->resample_length, lmd->source_vertex_group, lmd->vgname, lmd->flags); @@ -381,8 +380,6 @@ static void chaining_panel_draw(const bContext *UNUSED(C), Panel *panel) uiItemR(layout, ptr, "chaining_image_threshold", 0, NULL, ICON_NONE); - uiItemR(layout, ptr, "resample_length", UI_ITEM_R_SLIDER, NULL, ICON_NONE); - uiItemR(layout, ptr, "split_angle", UI_ITEM_R_SLIDER, NULL, ICON_NONE); } diff --git a/source/blender/gpencil_modifiers/intern/lineart/MOD_lineart.h b/source/blender/gpencil_modifiers/intern/lineart/MOD_lineart.h index 1239deb95bb..85cfd1fbcbf 100644 --- a/source/blender/gpencil_modifiers/intern/lineart/MOD_lineart.h +++ b/source/blender/gpencil_modifiers/intern/lineart/MOD_lineart.h @@ -560,7 +560,6 @@ void MOD_lineart_gpencil_generate(LineartRenderBuffer *rb, unsigned char transparency_mask, short thickness, float opacity, - float resample_length, const char *source_vgname, const char *vgname, int modifier_flags); diff --git a/source/blender/gpencil_modifiers/intern/lineart/lineart_cpu.c b/source/blender/gpencil_modifiers/intern/lineart/lineart_cpu.c index 2389e0c403c..8bcf620a882 100644 --- a/source/blender/gpencil_modifiers/intern/lineart/lineart_cpu.c +++ b/source/blender/gpencil_modifiers/intern/lineart/lineart_cpu.c @@ -3768,7 +3768,6 @@ static void lineart_gpencil_generate(LineartRenderBuffer *rb, uchar transparency_mask, short thickness, float opacity, - float resample_length, const char *source_vgname, const char *vgname, int modifier_flags) @@ -3908,9 +3907,6 @@ static void lineart_gpencil_generate(LineartRenderBuffer *rb, } } - if (resample_length > 0.0001) { - BKE_gpencil_stroke_sample(gpencil_object->data, gps, resample_length, false); - } if (G.debug_value == 4000) { BKE_gpencil_stroke_set_random_color(gps); } @@ -3941,7 +3937,6 @@ void MOD_lineart_gpencil_generate(LineartRenderBuffer *rb, uchar transparency_mask, short thickness, float opacity, - float resample_length, const char *source_vgname, const char *vgname, int modifier_flags) @@ -3991,7 +3986,6 @@ void MOD_lineart_gpencil_generate(LineartRenderBuffer *rb, transparency_mask, thickness, opacity, - resample_length, source_vgname, vgname, modifier_flags); diff --git a/source/blender/gpencil_modifiers/intern/lineart/lineart_ops.c b/source/blender/gpencil_modifiers/intern/lineart/lineart_ops.c index 3ec32ad501e..0c6b4ebf30c 100644 --- a/source/blender/gpencil_modifiers/intern/lineart/lineart_ops.c +++ b/source/blender/gpencil_modifiers/intern/lineart/lineart_ops.c @@ -131,7 +131,6 @@ static bool bake_strokes(Object *ob, Depsgraph *dg, GpencilModifierData *md, int lmd->transparency_mask, lmd->thickness, lmd->opacity, - lmd->resample_length, lmd->source_vertex_group, lmd->vgname, lmd->flags); diff --git a/source/blender/makesdna/DNA_gpencil_modifier_types.h b/source/blender/makesdna/DNA_gpencil_modifier_types.h index bc046a3b830..0572bf41112 100644 --- a/source/blender/makesdna/DNA_gpencil_modifier_types.h +++ b/source/blender/makesdna/DNA_gpencil_modifier_types.h @@ -868,7 +868,7 @@ typedef struct LineartGpencilModifierData { /* CPU mode */ float chaining_image_threshold; - float resample_length; + int _pad; /* Ported from SceneLineArt flags. */ int calculation_flags; diff --git a/source/blender/makesrna/intern/rna_gpencil_modifier.c b/source/blender/makesrna/intern/rna_gpencil_modifier.c index 6c6f18ab5a4..3a889da754d 100644 --- a/source/blender/makesrna/intern/rna_gpencil_modifier.c +++ b/source/blender/makesrna/intern/rna_gpencil_modifier.c @@ -2524,15 +2524,6 @@ static void rna_def_modifier_gpencillineart(BlenderRNA *brna) RNA_def_property_range(prop, 0.0f, 1.0f); RNA_def_property_update(prop, 0, "rna_GpencilModifier_update"); - prop = RNA_def_property(srna, "resample_length", PROP_FLOAT, PROP_DISTANCE); - RNA_def_property_ui_text(prop, - "Resample Length", - "Resample the strokes so that the stroke points have the specified " - "length between them. Zero length disables the resampling"); - RNA_def_property_ui_range(prop, 0.0f, 1.0f, 0.01f, 2); - RNA_def_property_range(prop, 0.0f, 1.0f); - RNA_def_property_update(prop, 0, "rna_GpencilModifier_update"); - prop = RNA_def_property(srna, "use_transparency", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "transparency_flags", LRT_GPENCIL_TRANSPARENCY_ENABLE); RNA_def_property_ui_text( |