diff options
Diffstat (limited to 'source/blender/gpencil_modifiers')
-rw-r--r-- | source/blender/gpencil_modifiers/intern/MOD_gpencillineart.c | 2 | ||||
-rw-r--r-- | source/blender/gpencil_modifiers/intern/lineart/lineart_cpu.c | 18 |
2 files changed, 6 insertions, 14 deletions
diff --git a/source/blender/gpencil_modifiers/intern/MOD_gpencillineart.c b/source/blender/gpencil_modifiers/intern/MOD_gpencillineart.c index 22ba035be8a..eca82f4cb90 100644 --- a/source/blender/gpencil_modifiers/intern/MOD_gpencillineart.c +++ b/source/blender/gpencil_modifiers/intern/MOD_gpencillineart.c @@ -408,8 +408,6 @@ static void vgroup_panel_draw(const bContext *UNUSED(C), Panel *panel) uiItemPointerR( col, ptr, "vertex_group", &ob_ptr, "vertex_groups", IFACE_("Target"), ICON_NONE); } - - uiItemR(col, ptr, "use_soft_selection", 0, NULL, ICON_NONE); } static void baking_panel_draw(const bContext *UNUSED(C), Panel *panel) diff --git a/source/blender/gpencil_modifiers/intern/lineart/lineart_cpu.c b/source/blender/gpencil_modifiers/intern/lineart/lineart_cpu.c index 8bcf620a882..49e0d03c459 100644 --- a/source/blender/gpencil_modifiers/intern/lineart/lineart_cpu.c +++ b/source/blender/gpencil_modifiers/intern/lineart/lineart_cpu.c @@ -3801,7 +3801,6 @@ static void lineart_gpencil_generate(LineartRenderBuffer *rb, int enabled_types = lineart_rb_edge_types(rb); bool invert_input = modifier_flags & LRT_GPENCIL_INVERT_SOURCE_VGROUP; bool match_output = modifier_flags & LRT_GPENCIL_MATCH_OUTPUT_VGROUP; - bool preserve_weight = modifier_flags & LRT_GPENCIL_SOFT_SELECTION; LISTBASE_FOREACH (LineartLineChain *, rlc, &rb->chains) { @@ -3885,18 +3884,13 @@ static void lineart_gpencil_generate(LineartRenderBuffer *rb, } MDeformWeight *mdw = BKE_defvert_ensure_index(&me->dvert[vindex], dindex); MDeformWeight *gdw = BKE_defvert_ensure_index(&gps->dvert[sindex], gpdg); - if (preserve_weight) { - float use_weight = mdw->weight; - if (invert_input) { - use_weight = 1 - use_weight; - } - gdw->weight = MAX2(use_weight, gdw->weight); - } - else { - if (mdw->weight > 0.999f) { - gdw->weight = 1.0f; - } + + float use_weight = mdw->weight; + if (invert_input) { + use_weight = 1 - use_weight; } + gdw->weight = MAX2(use_weight, gdw->weight); + sindex++; } } |