[Bf-blender-cvs] [2115232a16d] master: Cleanup: Clang-Tidy readability-inconsistent-declaration-parameter-name fix
Sebastian Parborg
noreply at git.blender.org
Fri Sep 4 21:04:30 CEST 2020
Commit: 2115232a16d81d28dbdb8042ed8e9316858514c6
Author: Sebastian Parborg
Date: Fri Sep 4 20:59:13 2020 +0200
Branches: master
https://developer.blender.org/rB2115232a16d81d28dbdb8042ed8e9316858514c6
Cleanup: Clang-Tidy readability-inconsistent-declaration-parameter-name fix
No functional changes
===================================================================
M .clang-tidy
M source/blender/blenkernel/BKE_DerivedMesh.h
M source/blender/blenkernel/BKE_armature.h
M source/blender/blenkernel/BKE_blender.h
M source/blender/blenkernel/BKE_bpath.h
M source/blender/blenkernel/BKE_brush.h
M source/blender/blenkernel/BKE_bvhutils.h
M source/blender/blenkernel/BKE_camera.h
M source/blender/blenkernel/BKE_cdderivedmesh.h
M source/blender/blenkernel/BKE_collision.h
M source/blender/blenkernel/BKE_constraint.h
M source/blender/blenkernel/BKE_context.h
M source/blender/blenkernel/BKE_curveprofile.h
M source/blender/blenkernel/BKE_deform.h
M source/blender/blenkernel/BKE_dynamicpaint.h
M source/blender/blenkernel/BKE_gpencil_geom.h
M source/blender/blenkernel/BKE_image.h
M source/blender/blenkernel/BKE_kelvinlet.h
M source/blender/blenkernel/BKE_key.h
M source/blender/blenkernel/BKE_lattice.h
M source/blender/blenkernel/BKE_lib_id.h
M source/blender/blenkernel/BKE_main.h
M source/blender/blenkernel/BKE_main_idmap.h
M source/blender/blenkernel/BKE_mask.h
M source/blender/blenkernel/BKE_mesh.h
M source/blender/blenkernel/BKE_mesh_mapping.h
M source/blender/blenkernel/BKE_modifier.h
M source/blender/blenkernel/BKE_movieclip.h
M source/blender/blenkernel/BKE_multires.h
M source/blender/blenkernel/BKE_nla.h
M source/blender/blenkernel/BKE_node.h
M source/blender/blenkernel/BKE_object.h
M source/blender/blenkernel/BKE_packedFile.h
M source/blender/blenkernel/BKE_particle.h
M source/blender/blenkernel/BKE_pbvh.h
M source/blender/blenkernel/BKE_scene.h
M source/blender/blenkernel/BKE_sequencer.h
M source/blender/blenkernel/BKE_shader_fx.h
M source/blender/blenkernel/BKE_softbody.h
M source/blender/blenkernel/BKE_studiolight.h
M source/blender/blenkernel/BKE_subdiv_eval.h
M source/blender/blenkernel/BKE_text.h
M source/blender/blenkernel/BKE_tracking.h
M source/blender/blenkernel/intern/CCGSubSurf.c
M source/blender/blenkernel/intern/CCGSubSurf.h
M source/blender/blenkernel/intern/camera.c
M source/blender/blenkernel/intern/curve.c
M source/blender/blenkernel/intern/customdata.c
M source/blender/blenkernel/intern/deform.c
M source/blender/blenkernel/intern/fluid.c
M source/blender/blenkernel/intern/idprop.c
M source/blender/blenkernel/intern/image.c
M source/blender/blenkernel/intern/lattice.c
M source/blender/blenkernel/intern/lattice_deform.c
M source/blender/blenkernel/intern/mball.c
M source/blender/blenkernel/intern/object.c
M source/blender/blenkernel/intern/screen.c
M source/blender/blenkernel/intern/sequencer.c
M source/blender/blenlib/BLI_array_utils.h
M source/blender/blenlib/BLI_boxpack_2d.h
M source/blender/blenlib/BLI_dot_export.hh
M source/blender/blenlib/BLI_dynstr.h
M source/blender/blenlib/BLI_edgehash.h
M source/blender/blenlib/BLI_fileops.h
M source/blender/blenlib/BLI_ghash.h
M source/blender/blenlib/BLI_gsqueue.h
M source/blender/blenlib/BLI_kdopbvh.h
M source/blender/blenlib/BLI_listbase.h
M source/blender/blenlib/BLI_math_color.h
M source/blender/blenlib/BLI_math_geom.h
M source/blender/blenlib/BLI_math_interp.h
M source/blender/blenlib/BLI_math_matrix.h
M source/blender/blenlib/BLI_math_rotation.h
M source/blender/blenlib/BLI_math_statistics.h
M source/blender/blenlib/BLI_math_vector.h
M source/blender/blenlib/BLI_memblock.h
M source/blender/blenlib/BLI_mesh_boolean.hh
M source/blender/blenlib/BLI_path_util.h
M source/blender/blenlib/BLI_rect.h
M source/blender/blenlib/BLI_string.h
M source/blender/blenlib/BLI_string_utf8.h
M source/blender/blenlib/BLI_task.h
M source/blender/blenlib/BLI_timecode.h
M source/blender/blenlib/intern/BLI_heap.c
M source/blender/blenlib/intern/array_utils.c
M source/blender/blenlib/intern/gsqueue.c
M source/blender/blenlib/intern/hash_mm3.c
M source/blender/blenlib/intern/jitter_2d.c
M source/blender/blenlib/intern/math_geom.c
M source/blender/blenlib/intern/math_matrix.c
M source/blender/blenlib/intern/math_rotation.c
M source/blender/blenlib/intern/math_vector.c
M source/blender/blenlib/intern/memory_utils.c
M source/blender/blenlib/intern/smallhash.c
M source/blender/blenlib/intern/storage.c
M source/blender/blenlib/tests/BLI_edgehash_test.cc
M source/blender/blenlib/tests/BLI_string_test.cc
M source/blender/blenloader/BLO_read_write.h
M source/blender/blenloader/BLO_readfile.h
M source/blender/blenloader/intern/readfile.h
M source/blender/blenloader/intern/undofile.c
M source/blender/bmesh/intern/bmesh_construct.c
M source/blender/bmesh/intern/bmesh_core.c
M source/blender/bmesh/intern/bmesh_core.h
M source/blender/bmesh/intern/bmesh_edgeloop.h
M source/blender/bmesh/intern/bmesh_marking.c
M source/blender/bmesh/intern/bmesh_marking.h
M source/blender/bmesh/intern/bmesh_mesh.h
M source/blender/bmesh/intern/bmesh_mods.h
M source/blender/bmesh/intern/bmesh_operator_api.h
M source/blender/bmesh/intern/bmesh_polygon.h
M source/blender/bmesh/intern/bmesh_query.c
M source/blender/bmesh/intern/bmesh_query.h
M source/blender/bmesh/tools/bmesh_path_region.h
M source/blender/bmesh/tools/bmesh_path_region_uv.h
M source/blender/bmesh/tools/bmesh_triangulate.h
M source/blender/compositor/intern/COM_ExecutionGroup.h
M source/blender/compositor/intern/COM_Node.cpp
M source/blender/compositor/intern/COM_NodeGraph.cpp
M source/blender/compositor/intern/COM_NodeGraph.h
M source/blender/compositor/nodes/COM_ImageNode.h
M source/blender/compositor/nodes/COM_KeyingNode.h
M source/blender/compositor/operations/COM_BlurBaseOperation.h
M source/blender/compositor/operations/COM_DoubleEdgeMaskOperation.h
M source/blender/compositor/operations/COM_ReadBufferOperation.h
M source/blender/compositor/operations/COM_WrapOperation.h
M source/blender/depsgraph/DEG_depsgraph_debug.h
M source/blender/depsgraph/intern/builder/deg_builder_nodes.cc
M source/blender/depsgraph/intern/builder/deg_builder_relations.h
M source/blender/depsgraph/intern/debug/deg_debug_relations_graphviz.cc
M source/blender/depsgraph/intern/debug/deg_debug_stats_gnuplot.cc
M source/blender/draw/engines/eevee/eevee_lightcache.h
M source/blender/draw/engines/eevee/eevee_private.h
M source/blender/draw/engines/gpencil/gpencil_engine.h
M source/blender/draw/intern/DRW_render.h
M source/blender/draw/intern/draw_manager_data.c
M source/blender/editors/animation/keyframes_edit.c
M source/blender/editors/armature/armature_intern.h
M source/blender/editors/armature/armature_naming.c
M source/blender/editors/armature/meshlaplacian.c
M source/blender/editors/armature/meshlaplacian.h
M source/blender/editors/include/ED_armature.h
M source/blender/editors/include/ED_fileselect.h
M source/blender/editors/include/ED_keyframes_draw.h
M source/blender/editors/include/ED_keyframing.h
M source/blender/editors/include/ED_mesh.h
M source/blender/editors/include/ED_object.h
M source/blender/editors/include/ED_paint.h
M source/blender/editors/include/ED_space_api.h
M source/blender/editors/include/ED_time_scrub_ui.h
M source/blender/editors/include/ED_transform.h
M source/blender/editors/include/ED_view3d.h
M source/blender/editors/include/UI_interface.h
M source/blender/editors/interface/interface_intern.h
M source/blender/editors/interface/interface_region_popover.c
M source/blender/editors/mesh/editmesh_knife.c
M source/blender/editors/object/object_constraint.c
M source/blender/editors/screen/screen_intern.h
M source/blender/editors/sculpt_paint/paint_intern.h
M source/blender/editors/space_file/filelist.h
M source/blender/editors/space_file/fsmenu.c
M source/blender/editors/space_file/fsmenu.h
M source/blender/editors/space_graph/graph_intern.h
M source/blender/editors/space_info/info_draw.c
M source/blender/editors/space_node/node_edit.c
M source/blender/editors/space_node/node_templates.c
M source/blender/editors/space_outliner/outliner_intern.h
M source/blender/editors/space_outliner/outliner_tools.c
M source/blender/editors/space_outliner/outliner_utils.c
M source/blender/editors/space_sequencer/sequencer_draw.c
M source/blender/editors/space_sequencer/sequencer_scopes.c
M source/blender/editors/space_text/text_intern.h
M source/blender/editors/space_view3d/view3d_edit.c
M source/blender/editors/space_view3d/view3d_fly.c
M source/blender/editors/space_view3d/view3d_project.c
M source/blender/editors/space_view3d/view3d_walk.c
M source/blender/editors/undo/ed_undo.c
M source/blender/editors/uvedit/uvedit_parametrizer.h
M source/blender/freestyle/intern/application/Controller.cpp
M source/blender/freestyle/intern/geometry/GeomUtils.h
M source/blender/freestyle/intern/geometry/Grid.h
M source/blender/freestyle/intern/stroke/AdvancedStrokeShaders.cpp
M source/blender/freestyle/intern/stroke/Canvas.h
M source/blender/freestyle/intern/stroke/Curve.h
M source/blender/freestyle/intern/stroke/Stroke.h
M source/blender/freestyle/intern/stroke/StrokeRenderer.cpp
M source/blender/freestyle/intern/stroke/StrokeRep.cpp
M source/blender/freestyle/intern/system/RandGen.h
M source/blender/freestyle/intern/view_map/FEdgeXDetector.h
M source/blender/freestyle/intern/view_map/SteerableViewMap.cpp
M source/blender/freestyle/intern/view_map/SteerableViewMap.h
M source/blender/freestyle/intern/view_map/ViewEdgeXBuilder.h
M source/blender/freestyle/intern/view_map/ViewMap.h
M source/blender/freestyle/intern/view_map/ViewMapTesselator.cpp
M source/blender/freestyle/intern/winged_edge/Curvature.h
M source/blender/gpu/GPU_batch.h
M source/blender/gpu/GPU_buffers.h
M source/blender/gpu/GPU_element.h
M source/blender/gpu/GPU_framebuffer.h
M source/blender/gpu/GPU_immediate_util.h
M source/blender/gpu/GPU_material.h
M source/blender/gpu/GPU_shader.h
M source/blender/gpu/GPU_state.h
M source/blender/gpu/GPU_texture.h
M source/blender/gpu/GPU_uniform_buffer.h
M source/blender/gpu/GPU_viewport.h
M source/blender/gpu/intern/gpu_shader.cc
M source/blender/imbuf/IMB_colormanagement.h
M source/blender/imbuf/IMB_imbuf.h
M source/blender/imbuf/IMB_thumbs.h
M source/blender/imbuf/intern/IMB_filetype.h
M source/blender/imbuf/intern/IMB_indexer.h
M source/blender/imbuf/intern/bmp.c
M source/blender/imbuf/intern/cineon/cineon_dpx.c
M source/blender/imbuf/intern/cineon/logImageCore.c
M source/blender/imbuf/intern/imageprocess.c
M source/blender/imbuf/intern/iris.c
M source/blender/imbuf/intern/jpeg.c
M source/blender/imbuf/intern/openexr/openexr_api.cpp
M source/blender/imbuf/intern/png.c
M source/blender/imbuf/intern/radiance_hdr.c
M source/blender/imbuf/intern/targa.c
M source/blender/imbuf/intern/tiff.c
M source/blender/imbuf/intern/writeimage.c
M source/blender/io/alembic/ABC_alembic.h
M source/blender/io/alembic/intern/abc_axis_conversion.h
M source/blender/io/collada/AnimationExporter.h
M source/blender/io/collada/ArmatureImporter.cpp
M source/blender/io/collada/BCAnimationSampler.h
M source/blender/io/collada/BCMath.cpp
M source/blender/io/collada/BCMath.h
M source/blender/io/collada/CameraExporter.h
M source/blender/io/collada/DocumentExporter.cpp
M source/blender/io/collada/EffectExporter.h
M source/blender/io/collada/GeometryExporter.h
M source/blender/io/collada/ImageExporter.h
M source/blender/io/collada/MeshImporter.cpp
M source/blender/io/collada/MeshImporter.h
M source/blender/io/collada/collada_utils.h
M source/blender/makesdna/intern/dna_utils.h
M source/blender/modifiers/intern/MOD_util.h
M source/blender/modifiers/intern/MOD_weightvg_util.h
M source/blender/nodes/composite/node_composite_tree.c
M source/blender/nodes/texture/node_texture_tree.c
M source/blender/python/BPY_extern_python.h
M source/blender/python/bmesh/bmesh_py_types.h
M source/blender/python/bmesh/bmesh_py_types_meshdata.c
M source/blender/python/bmesh/bmesh_py_types_meshdata.h
M source/blender/python/gpu/gpu_py_vertex_buffer.h
M source/blender/python/intern/bpy_rna_callback.h
M source/blender/python/mathutils/mathutils.h
M source/blender/python/mathutils/mathutils_Vector.c
M source/blender/render/extern/include/RE_pipeline.h
M source/blender/render/intern/include/render_result.h
M source/blender/render/intern/include/zbuf.h
M source/blender/render/intern/source/initrender.c
M source/blender/render/intern/source/pipeline.c
M source/blender/render/intern/source/render_result.c
M source/blender/simulation/intern/implicit.h
M source/blender/windowmanager/WM_api.h
M source/blender/windowmanager/WM_toolsystem.h
M source/blender/windowmanager/gizmo/WM_gizmo_api.h
M source/blender/windowmanager/gizmo/intern/wm_gizmo_group.c
M source/blender/windowmanager/intern/wm_keymap.c
M source/blender/windowmanager/intern/wm_toolsystem.c
M source/blender/windowmanager/message_bus/wm_message_bus.h
===================================================================
diff --git a/.clang-tidy b/.clang-tidy
index bfb6b27c3c1..8e76892ec5a 100644
--- a/.clang-tidy
+++ b/.clang-tidy
@@ -15,7 +15,6 @@ Checks: >
-readability-misleading-indentation,
- -readability-inconsistent-declaration-parameter-name,
-readability-redundant-member-init,
-readability-use-anyofallof,
diff --git a/source/blender/blenkernel/BKE_DerivedMesh.h b/source/blender/blenkernel/BKE_DerivedMesh.h
index 9752185bc40..42ce7e06c26 100644
--- a/source/blender/blenkernel/BKE_DerivedMesh.h
+++ b/source/blender/blenkernel/BKE_DerivedMesh.h
@@ -257,7 +257,7 @@ void DM_init(DerivedMesh *dm,
DerivedMeshType type,
int numVerts,
int numEdges,
- int numFaces,
+ int numTessFaces,
int numLoops,
int numPolys);
@@ -275,7 +275,7 @@ void DM_from_template(DerivedMesh *dm,
DerivedMeshType type,
int numVerts,
int numEdges,
- int numFaces,
+ int numTessFaces,
int numLoops,
int numPolys);
@@ -353,7 +353,7 @@ struct Mesh *editbmesh_get_eval_cage(struct Depsgraph *depsgraph,
const struct CustomData_MeshMasks *dataMask);
struct Mesh *editbmesh_get_eval_cage_from_orig(struct Depsgraph *depsgraph,
struct Scene *scene,
- struct Object *object,
+ struct Object *obedit,
const struct CustomData_MeshMasks *dataMask);
struct Mesh *editbmesh_get_eval_cage_and_final(struct Depsgraph *depsgraph,
struct Scene *scene,
@@ -375,7 +375,7 @@ void makeDerivedMesh(struct Depsgraph *depsgraph,
void DM_calc_loop_tangents(DerivedMesh *dm,
bool calc_active_tangent,
const char (*tangent_names)[MAX_NAME],
- int tangent_names_count);
+ int tangent_names_len);
/* debug only */
#ifndef NDEBUG
diff --git a/source/blender/blenkernel/BKE_armature.h b/source/blender/blenkernel/BKE_armature.h
index 6d48397b1af..7c5d0011465 100644
--- a/source/blender/blenkernel/BKE_armature.h
+++ b/source/blender/blenkernel/BKE_armature.h
@@ -95,7 +95,7 @@ bool BKE_armature_bone_flag_test_recursive(const struct Bone *bone, int flag);
void BKE_armature_refresh_layer_used(struct Depsgraph *depsgraph, struct bArmature *arm);
float distfactor_to_bone(
- const float vec[3], const float b1[3], const float b2[3], float r1, float r2, float rdist);
+ const float vec[3], const float b1[3], const float b2[3], float rad1, float rad2, float rdist);
void BKE_armature_where_is(struct bArmature *arm);
void BKE_armature_where_is_bone(struct Bone *bone,
@@ -153,8 +153,8 @@ void BKE_armature_mat_pose_to_bone_ex(struct Depsgraph *depsgraph,
void BKE_pchan_mat3_to_rot(struct bPoseChannel *pchan, const float mat[3][3], bool use_compat);
void BKE_pchan_rot_to_mat3(const struct bPoseChannel *pchan, float r_mat[3][3]);
-void BKE_pchan_apply_mat4(struct bPoseChannel *pchan, const float mat[4][4], bool use_comat);
-void BKE_pchan_to_mat4(const struct bPoseChannel *pchan, float r_mat[4][4]);
+void BKE_pchan_apply_mat4(struct bPoseChannel *pchan, const float mat[4][4], bool use_compat);
+void BKE_pchan_to_mat4(const struct bPoseChannel *pchan, float r_chanmat[4][4]);
void BKE_pchan_calc_mat(struct bPoseChannel *pchan);
/* Simple helper, computes the offset bone matrix. */
diff --git a/source/blender/blenkernel/BKE_blender.h b/source/blender/blenkernel/BKE_blender.h
index abc0ce1f092..813472715fa 100644
--- a/source/blender/blenkernel/BKE_blender.h
+++ b/source/blender/blenkernel/BKE_blender.h
@@ -34,12 +34,12 @@ void BKE_blender_free(void);
void BKE_blender_globals_init(void);
void BKE_blender_globals_clear(void);
-void BKE_blender_userdef_data_swap(struct UserDef *userdef_dst, struct UserDef *userdef_src);
+void BKE_blender_userdef_data_swap(struct UserDef *userdef_a, struct UserDef *userdef_b);
void BKE_blender_userdef_data_set(struct UserDef *userdef);
void BKE_blender_userdef_data_set_and_free(struct UserDef *userdef);
-void BKE_blender_userdef_app_template_data_swap(struct UserDef *userdef_dst,
- struct UserDef *userdef_src);
+void BKE_blender_userdef_app_template_data_swap(struct UserDef *userdef_a,
+ struct UserDef *userdef_b);
void BKE_blender_userdef_app_template_data_set(struct UserDef *userdef);
void BKE_blender_userdef_app_template_data_set_and_free(struct UserDef *userdef);
diff --git a/source/blender/blenkernel/BKE_bpath.h b/source/blender/blenkernel/BKE_bpath.h
index 787dc4d1147..3ec5409ca7f 100644
--- a/source/blender/blenkernel/BKE_bpath.h
+++ b/source/blender/blenkernel/BKE_bpath.h
@@ -35,17 +35,20 @@ struct ReportList;
* path has changed, and in that case, should write the result to pathOut. */
typedef bool (*BPathVisitor)(void *userdata, char *path_dst, const char *path_src);
/* Executes 'visit' for each path associated with 'id'. */
-void BKE_bpath_traverse_id(
- struct Main *bmain, struct ID *id, BPathVisitor visit_cb, const int flag, void *userdata);
+void BKE_bpath_traverse_id(struct Main *bmain,
+ struct ID *id,
+ BPathVisitor visit_cb,
+ const int flag,
+ void *bpath_user_data);
void BKE_bpath_traverse_id_list(struct Main *bmain,
struct ListBase *lb,
BPathVisitor visit_cb,
const int flag,
- void *userdata);
+ void *bpath_user_data);
void BKE_bpath_traverse_main(struct Main *bmain,
BPathVisitor visit_cb,
const int flag,
- void *userdata);
+ void *bpath_user_data);
bool BKE_bpath_relocate_visitor(void *oldbasepath, char *path_dst, const char *path_src);
/* Functions for temp backup/restore of paths, path count must NOT change */
diff --git a/source/blender/blenkernel/BKE_brush.h b/source/blender/blenkernel/BKE_brush.h
index af299c917eb..b14d24e205a 100644
--- a/source/blender/blenkernel/BKE_brush.h
+++ b/source/blender/blenkernel/BKE_brush.h
@@ -113,10 +113,12 @@ const float *BKE_brush_secondary_color_get(const struct Scene *scene, const stru
void BKE_brush_color_set(struct Scene *scene, struct Brush *brush, const float color[3]);
int BKE_brush_size_get(const struct Scene *scene, const struct Brush *brush);
-void BKE_brush_size_set(struct Scene *scene, struct Brush *brush, int value);
+void BKE_brush_size_set(struct Scene *scene, struct Brush *brush, int size);
float BKE_brush_unprojected_radius_get(const struct Scene *scene, const struct Brush *brush);
-void BKE_brush_unprojected_radius_set(struct Scene *scene, struct Brush *brush, float value);
+void BKE_brush_unprojected_radius_set(struct Scene *scene,
+ struct Brush *brush,
+ float unprojected_radius);
float BKE_brush_alpha_get(const struct Scene *scene, const struct Brush *brush);
void BKE_brush_alpha_set(struct Scene *scene, struct Brush *brush, float alpha);
diff --git a/source/blender/blenkernel/BKE_bvhutils.h b/source/blender/blenkernel/BKE_bvhutils.h
index e973bee9e20..84a17136361 100644
--- a/source/blender/blenkernel/BKE_bvhutils.h
+++ b/source/blender/blenkernel/BKE_bvhutils.h
@@ -130,7 +130,7 @@ BVHTree *bvhtree_from_editmesh_verts_ex(BVHTreeFromEditMesh *data,
BVHTree *bvhtree_from_mesh_verts_ex(struct BVHTreeFromMesh *data,
const struct MVert *vert,
- const int numVerts,
+ const int verts_num,
const bool vert_allocated,
const BLI_bitmap *mask,
int verts_num_active,
@@ -177,7 +177,7 @@ BVHTree *bvhtree_from_mesh_faces_ex(struct BVHTreeFromMesh *data,
const int numFaces,
const bool face_allocated,
const BLI_bitmap *mask,
- int numFaces_active,
+ int faces_num_active,
float epsilon,
int tree_type,
int axis,
diff --git a/source/blender/blenkernel/BKE_camera.h b/source/blender/blenkernel/BKE_camera.h
index 533d5ae13cd..2ea03f30d88 100644
--- a/source/blender/blenkernel/BKE_camera.h
+++ b/source/blender/blenkernel/BKE_camera.h
@@ -90,7 +90,7 @@ typedef struct CameraParams {
#define CAMERA_PARAM_ZOOM_INIT_PERSP 2.0f
void BKE_camera_params_init(CameraParams *params);
-void BKE_camera_params_from_object(CameraParams *params, const struct Object *camera);
+void BKE_camera_params_from_object(CameraParams *params, const struct Object *cam_ob);
void BKE_camera_params_from_view3d(CameraParams *params,
struct Depsgraph *depsgraph,
const struct View3D *v3d,
diff --git a/source/blender/blenkernel/BKE_cdderivedmesh.h b/source/blender/blenkernel/BKE_cdderivedmesh.h
index e997678001f..7695193d619 100644
--- a/source/blender/blenkernel/BKE_cdderivedmesh.h
+++ b/source/blender/blenkernel/BKE_cdderivedmesh.h
@@ -43,7 +43,7 @@ struct DerivedMesh *CDDM_from_mesh(struct Mesh *mesh);
/* Copies the given DerivedMesh with verts, faces & edges stored as
* custom element data. */
-struct DerivedMesh *CDDM_copy(struct DerivedMesh *dm);
+struct DerivedMesh *CDDM_copy(struct DerivedMesh *source);
#ifdef __cplusplus
}
diff --git a/source/blender/blenkernel/BKE_c
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list