diff options
| author | Rohan Rathi <rohanrathi08@gmail.com> | 2018-07-03 16:31:20 +0300 |
|---|---|---|
| committer | Rohan Rathi <rohanrathi08@gmail.com> | 2018-07-03 16:31:20 +0300 |
| commit | 190d1b2f7ae04cbe244b581f78dfdeb3387c9ea0 (patch) | |
| tree | 18dedd5ba861e9ab98b622fddbd6e5b97a072543 /source/blender/modifiers/intern/MOD_weighted_normal.c | |
| parent | 31e43d021fdc55c6ec6741d382f4bbb05d1d62e9 (diff) | |
Fixed merge errors
Diffstat (limited to 'source/blender/modifiers/intern/MOD_weighted_normal.c')
| -rw-r--r-- | source/blender/modifiers/intern/MOD_weighted_normal.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/modifiers/intern/MOD_weighted_normal.c b/source/blender/modifiers/intern/MOD_weighted_normal.c index b43ef698cc4..a2ace1aadc4 100644 --- a/source/blender/modifiers/intern/MOD_weighted_normal.c +++ b/source/blender/modifiers/intern/MOD_weighted_normal.c @@ -554,7 +554,7 @@ static Mesh *applyModifier(ModifierData *md, const ModifierEvalContext *ctx, Mes MDeformVert *dvert; int defgrp_index; - modifier_get_vgroup_mesh(ob, result, wnmd->defgrp_name, &dvert, &defgrp_index); + MOD_get_vgroup(ctx->object, mesh, wnmd->defgrp_name, &dvert, &defgrp_index); WeightedNormalData wn_data = { .numVerts = numVerts, |