From 3d8f1586973b1fbadf3cf45c66873d1a012764ee Mon Sep 17 00:00:00 2001 From: Matias Mendiola Date: Wed, 21 Aug 2019 08:30:45 +0200 Subject: GPencil: add new filter by material to modifiers This commit adds a new filter by material using the name and not only the index. Reviewers: antoniov, pepeland Differential Revision: https://developer.blender.org/D5544 --- source/blender/gpencil_modifiers/intern/MOD_gpencilsubdiv.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'source/blender/gpencil_modifiers/intern/MOD_gpencilsubdiv.c') diff --git a/source/blender/gpencil_modifiers/intern/MOD_gpencilsubdiv.c b/source/blender/gpencil_modifiers/intern/MOD_gpencilsubdiv.c index c8962cd58c9..741555722b5 100644 --- a/source/blender/gpencil_modifiers/intern/MOD_gpencilsubdiv.c +++ b/source/blender/gpencil_modifiers/intern/MOD_gpencilsubdiv.c @@ -47,6 +47,7 @@ static void initData(GpencilModifierData *md) gpmd->pass_index = 0; gpmd->level = 1; gpmd->layername[0] = '\0'; + gpmd->materialname[0] = '\0'; } static void copyData(const GpencilModifierData *md, GpencilModifierData *target) @@ -66,6 +67,7 @@ static void deformStroke(GpencilModifierData *md, if (!is_stroke_affected_by_modifier(ob, mmd->layername, + mmd->materialname, mmd->pass_index, mmd->layer_pass, 3, @@ -73,7 +75,8 @@ static void deformStroke(GpencilModifierData *md, gps, mmd->flag & GP_SUBDIV_INVERT_LAYER, mmd->flag & GP_SUBDIV_INVERT_PASS, - mmd->flag & GP_SUBDIV_INVERT_LAYERPASS)) { + mmd->flag & GP_SUBDIV_INVERT_LAYERPASS, + mmd->flag & GP_SUBDIV_INVERT_MATERIAL)) { return; } -- cgit v1.2.3