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:
authorYimingWu <xp8110@outlook.com>2021-10-26 12:09:17 +0300
committerYimingWu <xp8110@outlook.com>2021-10-26 12:11:51 +0300
commitfee2cedb33ccf33f72d0370892dd25faa884968b (patch)
tree043e848756f883731f6c24b24a2d1a0b5b3bd3f5
parentf11ed418e5faeb31aa6d581c320a2893a396878c (diff)
GPencil: Fix(unreported) Dash modifier wrong logic.
When the modifier iterates to an empty layer with no frame it will return, while the correct logic is to continue.
m---------release/datafiles/locale0
m---------release/scripts/addons0
m---------release/scripts/addons_contrib0
-rw-r--r--source/blender/gpencil_modifiers/intern/MOD_gpencildash.c2
m---------source/tools0
5 files changed, 1 insertions, 1 deletions
diff --git a/release/datafiles/locale b/release/datafiles/locale
-Subproject 8ee2942570f08d10484bb2328d0d1b0aaaa0367
+Subproject 80d9e7ee122c626cbbcd1da554683bce79f8d3d
diff --git a/release/scripts/addons b/release/scripts/addons
-Subproject c49c16c38d4bce29a1e0518d5fad5d90f42ab5e
+Subproject 27fe7f3a4f964b53af436c4da4ddea337eff0c7
diff --git a/release/scripts/addons_contrib b/release/scripts/addons_contrib
-Subproject 16467648282500cc229c271f62201ef897f2c2c
+Subproject 42da56aa73726710107031787af5eea18679798
diff --git a/source/blender/gpencil_modifiers/intern/MOD_gpencildash.c b/source/blender/gpencil_modifiers/intern/MOD_gpencildash.c
index ba33edd6a94..33cc3094a36 100644
--- a/source/blender/gpencil_modifiers/intern/MOD_gpencildash.c
+++ b/source/blender/gpencil_modifiers/intern/MOD_gpencildash.c
@@ -255,7 +255,7 @@ static void generateStrokes(GpencilModifierData *md, Depsgraph *depsgraph, Objec
BKE_gpencil_frame_active_set(depsgraph, gpd);
bGPDframe *gpf = gpl->actframe;
if (gpf == NULL) {
- return;
+ continue;
}
apply_dash_for_frame(ob, gpl, gpd, gpf, (DashGpencilModifierData *)md);
}
diff --git a/source/tools b/source/tools
-Subproject 2e8c879248822c8e500ed49d79acc605e5aa75b
+Subproject 7c5acb95df918503d11cfc43172ce1390101928