From 190d1b2f7ae04cbe244b581f78dfdeb3387c9ea0 Mon Sep 17 00:00:00 2001 From: Rohan Rathi Date: Tue, 3 Jul 2018 19:01:20 +0530 Subject: Fixed merge errors --- source/blender/modifiers/intern/MOD_weighted_normal.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'source/blender/modifiers/intern/MOD_weighted_normal.c') 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, -- cgit v1.2.3