[Bf-blender-cvs] [f067974] temp_depsgraph_split_ubereval: Avoid shadowing 'mask' function parameter by a local variable.

[Lukas Tönne]

Commit: f0679748800e5e451b00a71e537d338ace9d3cdd
Author: Lukas Tönne
Date:   Thu Apr 21 10:06:10 2016 +0200
Branches: temp_depsgraph_split_ubereval
https://developer.blender.org/rBf0679748800e5e451b00a71e537d338ace9d3cdd

Avoid shadowing 'mask' function parameter by a local variable.

===================================================================

M	source/blender/blenkernel/intern/modifier_calc.c

===================================================================

diff --git a/source/blender/blenkernel/intern/modifier_calc.c b/source/blender/blenkernel/intern/modifier_calc.c
index c6ff429..aee6602 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 */