[Bf-blender-cvs] [c2f0bd6aed3] master: Fix DEG warning from T52873: Proximity WeightVG modifier can use empty as target too.

Bastien Montagne noreply at git.blender.org
Wed Mar 20 21:14:09 CET 2019


Commit: c2f0bd6aed304f0a51dd4cd086312861f42a6821
Author: Bastien Montagne
Date:   Wed Mar 20 21:12:34 2019 +0100
Branches: master
https://developer.blender.org/rBc2f0bd6aed304f0a51dd4cd086312861f42a6821

Fix DEG warning from T52873: Proximity WeightVG modifier can use empty as target too.

Only create DEG_OB_COMP_GEOMETRY relation to target object when it has
some, and we use it.

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

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

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

diff --git a/source/blender/modifiers/intern/MOD_weightvgproximity.c b/source/blender/modifiers/intern/MOD_weightvgproximity.c
index b9921be752f..e2297d95e47 100644
--- a/source/blender/modifiers/intern/MOD_weightvgproximity.c
+++ b/source/blender/modifiers/intern/MOD_weightvgproximity.c
@@ -338,7 +338,9 @@ static void updateDepsgraph(ModifierData *md, const ModifierUpdateDepsgraphConte
 	WeightVGProximityModifierData *wmd = (WeightVGProximityModifierData *)md;
 	if (wmd->proximity_ob_target != NULL) {
 		DEG_add_object_relation(ctx->node, wmd->proximity_ob_target, DEG_OB_COMP_TRANSFORM, "WeightVGProximity Modifier");
-		DEG_add_object_relation(ctx->node, wmd->proximity_ob_target, DEG_OB_COMP_GEOMETRY, "WeightVGProximity Modifier");
+		if (wmd->proximity_ob_target->data != NULL && wmd->proximity_mode == MOD_WVG_PROXIMITY_GEOMETRY) {
+			DEG_add_object_relation(ctx->node, wmd->proximity_ob_target, DEG_OB_COMP_GEOMETRY, "WeightVGProximity Modifier");
+		}
 	}
 	if (wmd->mask_tex_map_obj != NULL && wmd->mask_tex_mapping == MOD_DISP_MAP_OBJECT) {
 		DEG_add_object_relation(ctx->node, wmd->mask_tex_map_obj, DEG_OB_COMP_TRANSFORM, "WeightVGProximity Modifier");



More information about the Bf-blender-cvs mailing list