diff options
| author | Lukas Tönne <lukas.toenne@gmail.com> | 2016-04-21 11:06:10 +0300 |
|---|---|---|
| committer | Lukas Tönne <lukas.toenne@gmail.com> | 2016-04-21 11:06:10 +0300 |
| commit | f0679748800e5e451b00a71e537d338ace9d3cdd (patch) | |
| tree | 039f2808b15b7debca7a95c0aaa8df8852017934 /source/blender/blenkernel/intern/modifier_calc.c | |
| parent | 2dfd53e8e94b79ac7ba3ca45b5eae605bb361813 (diff) | |
Avoid shadowing 'mask' function parameter by a local variable.
Diffstat (limited to 'source/blender/blenkernel/intern/modifier_calc.c')
| -rw-r--r-- | source/blender/blenkernel/intern/modifier_calc.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/blenkernel/intern/modifier_calc.c b/source/blender/blenkernel/intern/modifier_calc.c index c6ff429f63c..aee660247e8 100644 --- a/source/blender/blenkernel/intern/modifier_calc.c +++ b/source/blender/blenkernel/intern/modifier_calc.c @@ -870,8 +870,8 @@ static DerivedMesh *mesh_calc_create_input_dm(Object *ob, const ModifierEvalCont if (dm) { /* add an orco layer if needed by this modifier */ - CustomDataMask mask = mti->requiredDataMask ? mti->requiredDataMask(ob, md) : 0; - if (mask & CD_MASK_ORCO) + CustomDataMask required_mask = mti->requiredDataMask ? mti->requiredDataMask(ob, md) : 0; + if (required_mask & CD_MASK_ORCO) add_orco_dm(ob, NULL, dm, orcodm, CD_ORCO); /* apply vertex coordinates or build a DerivedMesh as necessary */ |