Commit: 62b3522da209edbad89276bb5a223bf30a398fcd
Author: Sergey Sharybin
Date: Thu Feb 22 13:05:38 2018 +0100
Branches: master
https://developer.blender.org/rB62b3522da209edbad89276bb5a223bf30a398fcd
Fix compilation error with legacy depsgraph disabled
===================================================================
M source/blender/modifiers/intern/MOD_cloth.c
M source/blender/modifiers/intern/MOD_dynamicpaint.c
===================================================================
diff --git a/source/blender/modifiers/intern/MOD_cloth.c
b/source/blender/modifiers/intern/MOD_cloth.c
index 5f806ba4e4c..2b181c0fb18 100644
--- a/source/blender/modifiers/intern/MOD_cloth.c
+++ b/source/blender/modifiers/intern/MOD_cloth.c
@@ -127,10 +127,7 @@ static void updateDepgraph(ModifierData *md, const
ModifierUpdateDepsgraphContex
dag_add_collision_relations(ctx->forest, ctx->scene,
ctx->object, ctx->obNode, clmd->coll_parms->group,
ctx->object->lay|ctx->scene->lay, eModifierType_Collision, NULL, true, "Cloth
Collision");
dag_add_forcefield_relations(ctx->forest, ctx->scene,
ctx->object, ctx->obNode, clmd->sim_parms->effector_weights, true, 0, "Cloth
Field");
#else
- (void)forest;
- (void)scene;
- (void)ob;
- (void)obNode;
+ (void)ctx;
#endif
}
}
diff --git a/source/blender/modifiers/intern/MOD_dynamicpaint.c
b/source/blender/modifiers/intern/MOD_dynamicpaint.c
index a610fc6ed8b..faf06f2d128 100644
--- a/source/blender/modifiers/intern/MOD_dynamicpaint.c
+++ b/source/blender/modifiers/intern/MOD_dynamicpaint.c
@@ -146,10 +146,7 @@ static void updateDepgraph(ModifierData *md, const
ModifierUpdateDepsgraphContex
dag_add_collision_relations(ctx->forest, ctx->scene,
ctx->object, ctx->obNode, surface->brush_group, -1, eModifierType_DynamicPaint,
is_brush_cb, false, "Dynamic Paint Brush");
}
#else
- (void)forest;
- (void)scene;
- (void)ob;
- (void)obNode;
+ (void)ctx;
#endif
}
}
_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
