[Bf-blender-cvs] [f2873a2f03b] lanpr-under-gp: LANPR: Modifier stroke generation code now funcional.

[YimingWu]

Commit: f2873a2f03b8eb51e892a4a22935eaa7466a8e43
Author: YimingWu
Date:   Sun Jun 28 14:58:45 2020 +0800
Branches: lanpr-under-gp
https://developer.blender.org/rBf2873a2f03b8eb51e892a4a22935eaa7466a8e43

LANPR: Modifier stroke generation code now funcional.

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

M	source/blender/editors/lineart/lineart_cpu.c

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

diff --git a/source/blender/editors/lineart/lineart_cpu.c b/source/blender/editors/lineart/lineart_cpu.c
index 196edbecfa3..253f58d5fb2 100644
--- a/source/blender/editors/lineart/lineart_cpu.c
+++ b/source/blender/editors/lineart/lineart_cpu.c
@@ -3991,16 +3991,21 @@ void ED_lineart_generate_gpencil_from_chain(Depsgraph *depsgraph,
     if (rlc->level > level_end || rlc->level < level_start) {
       continue;
     }
-    if (ob && &ob->id != rlc->object_ref->id.orig_id) {
+    if (ob && &ob->id != rlc->object_ref) {
+      /* Note: not object_ref and ob are both (same?) copy on write data, if legacy mode, use
+       * object_ref->id.orig_id. Same below.
+       * TODO? Should we always use orig_id in the future? */
       continue;
     }
     if (col && rlc->object_ref) {
-      if (!BKE_collection_has_object_recursive(col, (Object *)rlc->object_ref->id.orig_id)) {
+      if (!BKE_collection_has_object_recursive(col, (Object *)rlc->object_ref)) {
         continue;
       }
     }
 
-    rlc->picked = 1;
+    /* Modifier for different GP objects are not evaluated in order, thus picked flag doesn't quite
+     * make sense. Should have a batter solution if we don't want to pick the same stroke twice. */
+    /* rlc->picked = 1; */
 
     int array_idx = 0;
     int count = ED_lineart_count_chain(rlc);