diff options
author | Campbell Barton <ideasman42@gmail.com> | 2018-01-16 06:56:03 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2018-01-16 06:56:03 +0300 |
commit | 873a87c7e8f96e3f6785d90144182356b3fef7cd (patch) | |
tree | 590281363041582f796770466b0f898e4e905fbd /source/blender/editors/transform/transform.c | |
parent | 1e9bc60777421b861852f9289d1ca71a69bedc3f (diff) | |
parent | e428ea3e0055dd95445694a72ff5c6b491a46ec7 (diff) |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/editors/transform/transform.c')
-rw-r--r-- | source/blender/editors/transform/transform.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/editors/transform/transform.c b/source/blender/editors/transform/transform.c index 5a63532b0f5..24517a47118 100644 --- a/source/blender/editors/transform/transform.c +++ b/source/blender/editors/transform/transform.c @@ -5654,12 +5654,12 @@ static void slide_origdata_interp_data_vert( if (sod->layer_math_map_num) { if (do_loop_weight) { for (j = 0; j < sod->layer_math_map_num; j++) { - BM_vert_loop_groups_data_layer_merge_weights(bm, sv->cd_loop_groups[j], sod->layer_math_map[j], loop_weights); + BM_vert_loop_groups_data_layer_merge_weights(bm, sv->cd_loop_groups[j], sod->layer_math_map[j], loop_weights); } } else { for (j = 0; j < sod->layer_math_map_num; j++) { - BM_vert_loop_groups_data_layer_merge(bm, sv->cd_loop_groups[j], sod->layer_math_map[j]); + BM_vert_loop_groups_data_layer_merge(bm, sv->cd_loop_groups[j], sod->layer_math_map[j]); } } } |