[Bf-blender-cvs] [d551b56] object_nodes: Use a different variable name to prevent shadowing.
Lukas Tönne
noreply at git.blender.org
Wed Dec 9 16:29:30 CET 2015
Commit: d551b5668072af0d7b6a2f89f498059b424e4873
Author: Lukas Tönne
Date: Wed Dec 9 16:29:09 2015 +0100
Branches: object_nodes
https://developer.blender.org/rBd551b5668072af0d7b6a2f89f498059b424e4873
Use a different variable name to prevent shadowing.
===================================================================
M source/blender/blenkernel/intern/DerivedMesh.c
===================================================================
diff --git a/source/blender/blenkernel/intern/DerivedMesh.c b/source/blender/blenkernel/intern/DerivedMesh.c
index b329013..aaf6e56 100644
--- a/source/blender/blenkernel/intern/DerivedMesh.c
+++ b/source/blender/blenkernel/intern/DerivedMesh.c
@@ -1703,7 +1703,7 @@ static void dm_ensure_display_normals(DerivedMesh *dm)
}
/* XXX this should replace modifier stack eventually */
-static DerivedMesh *mesh_calc_modifier_nodes(Scene *scene, Object *ob, bNodeTree *ntree)
+static DerivedMesh *mesh_calc_modifier_nodes(Scene *UNUSED(scene), Object *ob, bNodeTree *ntree)
{
Mesh *me = ob->data;
DerivedMesh *dm, *result;
@@ -1794,7 +1794,7 @@ static void mesh_calc_modifiers(
if (ob->nodetree) {
bNodeTree *geotree = NULL;
- DerivedMesh *dm = NULL;
+ DerivedMesh *node_dm = NULL;
/* XXX TODO not nice, we can potentially have multiple geometry
* subtrees and it's not clear yet how these would be combined.
@@ -1811,16 +1811,16 @@ static void mesh_calc_modifiers(
}
if (geotree) {
- dm = mesh_calc_modifier_nodes(scene, ob, geotree);
- DM_ensure_normals(dm);
+ node_dm = mesh_calc_modifier_nodes(scene, ob, geotree);
+ DM_ensure_normals(node_dm);
}
else {
- dm = CDDM_from_mesh(me);
+ node_dm = CDDM_from_mesh(me);
}
- *r_final = dm;
+ *r_final = node_dm;
if (r_deform)
- *r_deform = CDDM_copy(dm);
+ *r_deform = CDDM_copy(node_dm);
return;
}
More information about the Bf-blender-cvs
mailing list