Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAntonioya <blendergit@gmail.com>2018-10-24 17:46:14 +0300
committerAntonioya <blendergit@gmail.com>2018-10-24 17:46:35 +0300
commit735d6cb8d87cc3bb8ba9a727b95480502dd0f2b1 (patch)
tree63efa0eb20b22a666d716c0129da91def278c0e3 /source/blender/gpencil_modifiers/intern/MOD_gpencilinstance.c
parenta211937892f55ac9510e0f9b625c1bd24cc12550 (diff)
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.
Diffstat (limited to 'source/blender/gpencil_modifiers/intern/MOD_gpencilinstance.c')
-rw-r--r--source/blender/gpencil_modifiers/intern/MOD_gpencilinstance.c5
1 files changed, 3 insertions, 2 deletions
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++;