[Bf-blender-cvs] [b88d128e5f1] lineart-shadow: Merge remote-tracking branch 'origin/master' into lineart-shadow

[Yiming Wu]

Commit: b88d128e5f1d1d2c1c48c4b108f44eff8b5281fd
Author: Yiming Wu
Date:   Thu Jun 2 09:25:45 2022 +0800
Branches: lineart-shadow
https://developer.blender.org/rBb88d128e5f1d1d2c1c48c4b108f44eff8b5281fd

Merge remote-tracking branch 'origin/master' into lineart-shadow

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



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

diff --cc source/blender/gpencil_modifiers/intern/lineart/lineart_cpu.c
index df94e285d4c,aae439c62a2..a44cd8249e4
--- a/source/blender/gpencil_modifiers/intern/lineart/lineart_cpu.c
+++ b/source/blender/gpencil_modifiers/intern/lineart/lineart_cpu.c
@@@ -2614,41 -2471,18 +2620,26 @@@ void lineart_main_load_geometries(Depsg
        continue;
      }
  
+     /* DEG_OBJECT_ITER_BEGIN will include the instanced mesh of these curve object types, so don't
+      * load them twice. */
+     if (allow_duplicates && ELEM(ob->type, OB_CURVES_LEGACY, OB_FONT, OB_SURF)) {
+       continue;
+     }
+ 
      if (BKE_object_visibility(eval_ob, eval_mode) & OB_VISIBLE_SELF) {
 -      lineart_object_load_single_instance(
 -          rb, depsgraph, scene, eval_ob, eval_ob, eval_ob->obmat, is_render, olti, thread_count);
 +      lineart_object_load_single_instance(rb,
 +                                          depsgraph,
 +                                          scene,
 +                                          eval_ob,
 +                                          eval_ob,
 +                                          eval_ob->obmat,
 +                                          is_render,
 +                                          olti,
 +                                          thread_count,
 +                                          obindex);
      }
-     if (allow_duplicates) {
-       ListBase *dupli = object_duplilist(depsgraph, scene, eval_ob);
-       LISTBASE_FOREACH (DupliObject *, dob, dupli) {
-         obindex++;
-         if (BKE_object_visibility(eval_ob, eval_mode) &
-             (OB_VISIBLE_PARTICLES | OB_VISIBLE_INSTANCES)) {
-           Object *ob_ref = (dob->type & OB_DUPLIPARTS) ? eval_ob : dob->ob;
-           lineart_object_load_single_instance(rb,
-                                               depsgraph,
-                                               scene,
-                                               dob->ob,
-                                               ob_ref,
-                                               dob->mat,
-                                               is_render,
-                                               olti,
-                                               thread_count,
-                                               obindex);
-         }
-       }
-       free_object_duplilist(dupli);
-     }
    }
-   FOREACH_SCENE_OBJECT_END;
+   DEG_OBJECT_ITER_END;
  
    TaskPool *tp = BLI_task_pool_create(NULL, TASK_PRIORITY_HIGH);