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-09-30 08:23:17 +0300
committerYimingWu <xp8110@outlook.com>2021-09-30 08:30:10 +0300
commit2c2516bfc92ba8fa0850ca6b6151dbc058b2cbce (patch)
tree72a03e30e2cc8c324e2da5c2a93905353b8ad3e6
parent66e24ce35bb37753b8002283a72d55639bb40239 (diff)
Fix(unreported): LineArt curve objects garbled result.
This is caused by line art loading curve objects twice from curve and converted mesh instances (when instance option is on). Now only load mesh when instance option is on.
-rw-r--r--source/blender/gpencil_modifiers/intern/lineart/lineart_cpu.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/source/blender/gpencil_modifiers/intern/lineart/lineart_cpu.c b/source/blender/gpencil_modifiers/intern/lineart/lineart_cpu.c
index 5b878a4326f..7441c9a909c 100644
--- a/source/blender/gpencil_modifiers/intern/lineart/lineart_cpu.c
+++ b/source/blender/gpencil_modifiers/intern/lineart/lineart_cpu.c
@@ -2168,6 +2168,12 @@ static void lineart_main_load_geometries(
use_mesh = use_ob->data;
}
else {
+ /* If DEG_ITER_OBJECT_FLAG_DUPLI is set, the curve objects are going to have a mesh
+ * equivalent already in the object list, so ignore converting the original curve in this
+ * case. */
+ if (allow_duplicates) {
+ continue;
+ }
use_mesh = BKE_mesh_new_from_object(depsgraph, use_ob, true, true);
}