From 735d6cb8d87cc3bb8ba9a727b95480502dd0f2b1 Mon Sep 17 00:00:00 2001 From: Antonioya Date: Wed, 24 Oct 2018 16:46:14 +0200 Subject: GP: Add new Layer Pass Index filter to modifiers Now the modifier can be filtered using the new layer index. Also changed panels to put layers and passes filter always at the end of the panel. --- source/blender/gpencil_modifiers/intern/MOD_gpencilinstance.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'source/blender/gpencil_modifiers/intern/MOD_gpencilinstance.c') diff --git a/source/blender/gpencil_modifiers/intern/MOD_gpencilinstance.c b/source/blender/gpencil_modifiers/intern/MOD_gpencilinstance.c index 05912e594f5..9c56a06af99 100644 --- a/source/blender/gpencil_modifiers/intern/MOD_gpencilinstance.c +++ b/source/blender/gpencil_modifiers/intern/MOD_gpencilinstance.c @@ -114,8 +114,9 @@ static void generate_geometry( * ATTENTION: The logic here is the inverse of what's used everywhere else! */ if (is_stroke_affected_by_modifier(ob, - mmd->layername, mmd->pass_index, 1, gpl, gps, - mmd->flag & GP_INSTANCE_INVERT_LAYER, mmd->flag & GP_INSTANCE_INVERT_PASS)) + mmd->layername, mmd->pass_index, mmd->layer_pass, 1, gpl, gps, + mmd->flag & GP_INSTANCE_INVERT_LAYER, mmd->flag & GP_INSTANCE_INVERT_PASS, + mmd->flag & GP_INSTANCE_INVERT_LAYERPASS)) { valid_strokes[idx] = true; num_valid++; -- cgit v1.2.3