diff options
author | Hans Goudey <h.goudey@me.com> | 2022-02-10 20:34:20 +0300 |
---|---|---|
committer | Hans Goudey <h.goudey@me.com> | 2022-02-10 20:34:20 +0300 |
commit | 29674d5e7885ca1b31088ff4abeeae0ff05b980f (patch) | |
tree | 0e32b102437a098ab0f308cd4ad16d969a9da67e /source/blender/gpencil_modifiers | |
parent | 22c60ac8b1583502a88a5a97d0017618cccb14df (diff) | |
parent | 88ff5e5fb9d66d3a441e325dc381754b6f9c093e (diff) |
Merge branch 'blender-v3.1-release'
Diffstat (limited to 'source/blender/gpencil_modifiers')
-rw-r--r-- | source/blender/gpencil_modifiers/intern/lineart/lineart_cpu.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/source/blender/gpencil_modifiers/intern/lineart/lineart_cpu.c b/source/blender/gpencil_modifiers/intern/lineart/lineart_cpu.c index 5434f7768b2..a9ec136831d 100644 --- a/source/blender/gpencil_modifiers/intern/lineart/lineart_cpu.c +++ b/source/blender/gpencil_modifiers/intern/lineart/lineart_cpu.c @@ -2224,10 +2224,10 @@ 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) { + /* If DEG_ITER_OBJECT_FLAG_DUPLI is set, some curve objects may also have an evaluated mesh + * object in the list. To avoid adding duplicate geometry, ignore evaluated curve objects in + * those cases. */ + if (allow_duplicates && BKE_object_get_evaluated_mesh(ob) != NULL) { continue; } use_mesh = BKE_mesh_new_from_object(depsgraph, use_ob, true, true); |