[Bf-blender-cvs] [2da010a96e4] temp-lineart-contained: Fix(unreported): LineArt curve objects garbled result.

[YimingWu]

Commit: 2da010a96e43d3aeed431e6d3b85ebcedabf74bc
Author: YimingWu
Date:   Thu Sep 30 13:23:17 2021 +0800
Branches: temp-lineart-contained
https://developer.blender.org/rB2da010a96e43d3aeed431e6d3b85ebcedabf74bc

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.

===================================================================

M	source/blender/gpencil_modifiers/intern/lineart/lineart_cpu.c

===================================================================

diff --git a/source/blender/gpencil_modifiers/intern/lineart/lineart_cpu.c b/source/blender/gpencil_modifiers/intern/lineart/lineart_cpu.c
index deb2afa0ae5..e5faa2bad0c 100644
--- a/source/blender/gpencil_modifiers/intern/lineart/lineart_cpu.c
+++ b/source/blender/gpencil_modifiers/intern/lineart/lineart_cpu.c
@@ -2275,6 +2275,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);
     }