[Bf-blender-cvs] [17416b80f67] master: Weight modifiers: Remove weird looking dependency

Sergey Sharybin noreply at git.blender.org
Tue Feb 12 12:59:15 CET 2019


Commit: 17416b80f674b44837400ee951f40a89c8dbd938
Author: Sergey Sharybin
Date:   Tue Feb 12 12:04:48 2019 +0100
Branches: master
https://developer.blender.org/rB17416b80f674b44837400ee951f40a89c8dbd938

Weight modifiers: Remove weird looking dependency

Modifiers are part of geometry component, no way they can
be dependent on the geometry component of the same object.

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

M	source/blender/modifiers/intern/MOD_weightvgmix.c
M	source/blender/modifiers/intern/MOD_weightvgproximity.c

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

diff --git a/source/blender/modifiers/intern/MOD_weightvgmix.c b/source/blender/modifiers/intern/MOD_weightvgmix.c
index b16ef17f87c..7db1aba3224 100644
--- a/source/blender/modifiers/intern/MOD_weightvgmix.c
+++ b/source/blender/modifiers/intern/MOD_weightvgmix.c
@@ -174,7 +174,6 @@ static void updateDepsgraph(ModifierData *md, const ModifierUpdateDepsgraphConte
 	}
 	else if (wmd->mask_tex_mapping == MOD_DISP_MAP_GLOBAL) {
 		DEG_add_modifier_to_transform_relation(ctx->node, "WeightVGMix Modifier");
-		DEG_add_object_relation(ctx->node, ctx->object, DEG_OB_COMP_GEOMETRY, "WeightVGMix Modifier");
 	}
 	if (wmd->mask_texture != NULL) {
 		DEG_add_generic_id_relation(ctx->node, &wmd->mask_texture->id, "WeightVGMix Modifier");
diff --git a/source/blender/modifiers/intern/MOD_weightvgproximity.c b/source/blender/modifiers/intern/MOD_weightvgproximity.c
index bb3898f97f5..0fd26598b54 100644
--- a/source/blender/modifiers/intern/MOD_weightvgproximity.c
+++ b/source/blender/modifiers/intern/MOD_weightvgproximity.c
@@ -348,7 +348,6 @@ static void updateDepsgraph(ModifierData *md, const ModifierUpdateDepsgraphConte
 		DEG_add_generic_id_relation(ctx->node, &wmd->mask_texture->id, "WeightVGProximity Modifier");
 	}
 	DEG_add_modifier_to_transform_relation(ctx->node, "WeightVGProximity Modifier");
-	DEG_add_object_relation(ctx->node, ctx->object, DEG_OB_COMP_GEOMETRY, "WeightVGProximity Modifier");
 }
 
 static bool isDisabled(const struct Scene *UNUSED(scene), ModifierData *md, bool UNUSED(useRenderParams))



More information about the Bf-blender-cvs mailing list