blender
/
blender
129
398
Fork 572
Code Issues 6.2k Pull Requests 748 Projects 19 Wiki Activity

LineArt: Remove resampling settings. 

This can be done with an other GP modifier already.
This commit is contained in:
YimingWu 2021-03-23 22:15:44 +08:00 committed by Sebastian Parborg
parent d5cefc1844
commit e1b2cf887f
6 changed files with 1 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
source/blender/gpencil_modifiers/intern/MOD_gpencillineart.c
View File

@ -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);
}

1
source/blender/gpencil_modifiers/intern/lineart/MOD_lineart.h
View File

@ -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);

6
source/blender/gpencil_modifiers/intern/lineart/lineart_cpu.c
View File

@ -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);

1
source/blender/gpencil_modifiers/intern/lineart/lineart_ops.c
View File

@ -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);

2
source/blender/makesdna/DNA_gpencil_modifier_types.h
View File

@ -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;

9
source/blender/makesrna/intern/rna_gpencil_modifier.c
View File

@ -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(