[Bf-blender-cvs] [4b51eb5743f] lanpr-under-gp: LineArt: revert to original object relation linking in modifier depsgraph.

[YimingWu]

Commit: 4b51eb5743fa25822483d834259a909656833d32
Author: YimingWu
Date:   Wed Sep 23 00:10:05 2020 +0800
Branches: lanpr-under-gp
https://developer.blender.org/rB4b51eb5743fa25822483d834259a909656833d32

LineArt: revert to original object relation linking in modifier depsgraph.

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

M	source/blender/gpencil_modifiers/intern/MOD_gpencillineart.c

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

diff --git a/source/blender/gpencil_modifiers/intern/MOD_gpencillineart.c b/source/blender/gpencil_modifiers/intern/MOD_gpencillineart.c
index 46ab74a8b28..050a1344863 100644
--- a/source/blender/gpencil_modifiers/intern/MOD_gpencillineart.c
+++ b/source/blender/gpencil_modifiers/intern/MOD_gpencillineart.c
@@ -279,17 +279,26 @@ static void updateDepsgraph(GpencilModifierData *md,
   DEG_add_object_relation(ctx->node, ctx->object, DEG_OB_COMP_TRANSFORM, "Line Art Modifier");
 
   LineartGpencilModifierData *lmd = (LineartGpencilModifierData *)md;
-
-  FOREACH_COLLECTION_VISIBLE_OBJECT_RECURSIVE_BEGIN (ctx->scene->master_collection, ob, mode) {
-    if (ob->type == OB_MESH || ob->type == OB_MBALL || ob->type == OB_CURVE ||
-        ob->type == OB_SURF || ob->type == OB_FONT) {
-      // if (!(ob->lineart.usage & OBJECT_LRT_EXCLUDE)) {
-      DEG_add_object_relation(ctx->node, ob, DEG_OB_COMP_GEOMETRY, "Line Art Modifier");
-      DEG_add_object_relation(ctx->node, ob, DEG_OB_COMP_TRANSFORM, "Line Art Modifier");
-      //}
+  if (lmd->source_type == LRT_SOURCE_OBJECT && lmd->source_object) {
+    DEG_add_object_relation(
+        ctx->node, lmd->source_object, DEG_OB_COMP_GEOMETRY, "Line Art Modifier");
+    DEG_add_object_relation(
+        ctx->node, lmd->source_object, DEG_OB_COMP_TRANSFORM, "Line Art Modifier");
+  }
+  else {
+    FOREACH_COLLECTION_VISIBLE_OBJECT_RECURSIVE_BEGIN (ctx->scene->master_collection, ob, mode) {
+      if (ob->type == OB_MESH || ob->type == OB_MBALL || ob->type == OB_CURVE ||
+          ob->type == OB_SURF || ob->type == OB_FONT) {
+        if (!(ob->lineart.usage & COLLECTION_LRT_EXCLUDE)) {
+          DEG_add_object_relation(ctx->node, ob, DEG_OB_COMP_GEOMETRY, "Line Art Modifier");
+          DEG_add_object_relation(ctx->node, ob, DEG_OB_COMP_TRANSFORM, "Line Art Modifier");
+        }
+      }
     }
+    FOREACH_COLLECTION_VISIBLE_OBJECT_RECURSIVE_END;
   }
-  FOREACH_COLLECTION_VISIBLE_OBJECT_RECURSIVE_END;
+  DEG_add_object_relation(
+      ctx->node, ctx->scene->camera, DEG_OB_COMP_TRANSFORM, "Line Art Modifier");
 }
 
 static void freeData(GpencilModifierData *UNUSED(md))