[Bf-blender-cvs] [705a77765de] lanpr-under-gp: LANPR: Collection mode depsgraph relationship with scene added.
YimingWu
noreply at git.blender.org
Sun Jun 28 11:38:01 CEST 2020
Commit: 705a77765de51175741611d392c61f9f322ba8dc
Author: YimingWu
Date: Sun Jun 28 17:37:56 2020 +0800
Branches: lanpr-under-gp
https://developer.blender.org/rB705a77765de51175741611d392c61f9f322ba8dc
LANPR: Collection mode depsgraph relationship with scene added.
===================================================================
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 82436a7720f..bf3e63d9879 100644
--- a/source/blender/gpencil_modifiers/intern/MOD_gpencillineart.c
+++ b/source/blender/gpencil_modifiers/intern/MOD_gpencillineart.c
@@ -183,6 +183,12 @@ static void updateDepsgraph(GpencilModifierData *md, const ModifierUpdateDepsgra
DEG_add_object_relation(
ctx->node, lmd->source_object, DEG_OB_COMP_TRANSFORM, "Line Art Modifier");
}
+ else {
+ DEG_add_scene_relation(ctx->node, ctx->scene, DEG_SCENE_COMP_PARAMETERS, "Line Art Modifier");
+ DEG_add_scene_relation(ctx->node, ctx->scene, DEG_SCENE_COMP_ANIMATION, "Line Art Modifier");
+ }
+ DEG_add_object_relation(
+ ctx->node, ctx->scene->camera, DEG_OB_COMP_TRANSFORM, "Line Art Modifier");
}
static void freeData(GpencilModifierData *md)
@@ -198,6 +204,7 @@ static void foreachObjectLink(GpencilModifierData *md,
LineartGpencilModifierData *lmd = (LineartGpencilModifierData *)md;
walk(userData, ob, &lmd->source_object, IDWALK_CB_NOP);
+ walk(userData, ob, (ID **)&lmd->source_collection, IDWALK_CB_NOP);
}
static void foreachIDLink(GpencilModifierData *md, Object *ob, IDWalkFunc walk, void *userData)
@@ -205,8 +212,6 @@ static void foreachIDLink(GpencilModifierData *md, Object *ob, IDWalkFunc walk,
LineartGpencilModifierData *lmd = (LineartGpencilModifierData *)md;
walk(userData, ob, (ID **)&lmd->target_gp_material, IDWALK_CB_USER);
- // walk(userData, ob, (ID **)&lmd->source_object, IDWALK_CB_USER);
- walk(userData, ob, (ID **)&lmd->source_collection, IDWALK_CB_USER);
foreachObjectLink(md, ob, (ObjectWalkFunc)walk, userData);
}
More information about the Bf-blender-cvs
mailing list