[Bf-blender-cvs] [f620f73b5ff] greasepencil-object: Filter index pass only if > 0 in modifiers
Antonio Vazquez
noreply at git.blender.org
Mon Jul 24 11:27:57 CEST 2017
Commit: f620f73b5fff5b598d462f27a5c0f42681ed14b6
Author: Antonio Vazquez
Date: Mon Jul 24 10:46:24 2017 +0200
Branches: greasepencil-object
https://developer.blender.org/rBf620f73b5fff5b598d462f27a5c0f42681ed14b6
Filter index pass only if > 0 in modifiers
If the pass index is equal to 0, the filter is disabled. This is a handy way of reset the filter without adding new flags.
===================================================================
M source/blender/blenkernel/intern/gpencil.c
===================================================================
diff --git a/source/blender/blenkernel/intern/gpencil.c b/source/blender/blenkernel/intern/gpencil.c
index cfe38c45e98..e91e742ebec 100644
--- a/source/blender/blenkernel/intern/gpencil.c
+++ b/source/blender/blenkernel/intern/gpencil.c
@@ -1647,14 +1647,16 @@ static bool is_stroke_affected_by_modifier(char *mlayername, int mpassindex, int
}
}
/* verify pass */
- if (inv2 == 0) {
- if (gps->palcolor->index != mpassindex) {
- return false;
+ if (mpassindex > 0) {
+ if (inv2 == 0) {
+ if (gps->palcolor->index != mpassindex) {
+ return false;
+ }
}
- }
- else {
- if (gps->palcolor->index == mpassindex) {
- return false;
+ else {
+ if (gps->palcolor->index == mpassindex) {
+ return false;
+ }
}
}
More information about the Bf-blender-cvs
mailing list