[Bf-blender-cvs] [48b449797ea] temp-lineart-contained: GPencil: Fix(unreported) Dash modifier wrong logic.
YimingWu
noreply at git.blender.org
Tue Oct 26 11:27:08 CEST 2021
Commit: 48b449797ea25c26c080534945c9b779cb25cca2
Author: YimingWu
Date: Tue Oct 26 17:09:17 2021 +0800
Branches: temp-lineart-contained
https://developer.blender.org/rB48b449797ea25c26c080534945c9b779cb25cca2
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/locale
M release/scripts/addons
M release/scripts/addons_contrib
M source/blender/gpencil_modifiers/intern/MOD_gpencildash.c
M source/tools
===================================================================
diff --git a/release/datafiles/locale b/release/datafiles/locale
index 8ee2942570f..80d9e7ee122 160000
--- a/release/datafiles/locale
+++ b/release/datafiles/locale
@@ -1 +1 @@
-Subproject commit 8ee2942570f08d10484bb2328d0d1b0aaaa0367c
+Subproject commit 80d9e7ee122c626cbbcd1da554683bce79f8d3df
diff --git a/release/scripts/addons b/release/scripts/addons
index c49c16c38d4..27fe7f3a4f9 160000
--- a/release/scripts/addons
+++ b/release/scripts/addons
@@ -1 +1 @@
-Subproject commit c49c16c38d4bce29a1e0518d5fad5d90f42ab5e7
+Subproject commit 27fe7f3a4f964b53af436c4da4ddea337eff0c7e
diff --git a/release/scripts/addons_contrib b/release/scripts/addons_contrib
index 16467648282..42da56aa737 160000
--- a/release/scripts/addons_contrib
+++ b/release/scripts/addons_contrib
@@ -1 +1 @@
-Subproject commit 16467648282500cc229c271f62201ef897f2c2c3
+Subproject commit 42da56aa73726710107031787af5eea186797984
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
index 2e8c8792488..7c5acb95df9 160000
--- a/source/tools
+++ b/source/tools
@@ -1 +1 @@
-Subproject commit 2e8c879248822c8e500ed49d79acc605e5aa75b9
+Subproject commit 7c5acb95df918503d11cfc43172ce13901019289
More information about the Bf-blender-cvs
mailing list