diff options
author | Hans Goudey <h.goudey@me.com> | 2021-12-02 19:20:22 +0300 |
---|---|---|
committer | Hans Goudey <h.goudey@me.com> | 2021-12-02 19:20:22 +0300 |
commit | 27b70428c1b1be6db4d66af2be5a7726c4690331 (patch) | |
tree | ba1767f3a3c4d2261a55616d0098c02d2e3debc3 /source/blender/blenkernel | |
parent | e6a732daad0588be17b71e4f928e5809477bd4c9 (diff) |
Cleanup: Avoid using C++ keyword as variable name
Diffstat (limited to 'source/blender/blenkernel')
-rw-r--r-- | source/blender/blenkernel/intern/DerivedMesh.cc | 32 |
1 files changed, 12 insertions, 20 deletions
diff --git a/source/blender/blenkernel/intern/DerivedMesh.cc b/source/blender/blenkernel/intern/DerivedMesh.cc index ced9076bbfd..09050c66cd6 100644 --- a/source/blender/blenkernel/intern/DerivedMesh.cc +++ b/source/blender/blenkernel/intern/DerivedMesh.cc @@ -2097,12 +2097,10 @@ Mesh *mesh_create_eval_final(Depsgraph *depsgraph, Object *ob, const CustomData_MeshMasks *dataMask) { - Mesh *final; - + Mesh *result; mesh_calc_modifiers( - depsgraph, scene, ob, true, false, dataMask, -1, false, false, nullptr, &final, nullptr); - - return final; + depsgraph, scene, ob, true, false, dataMask, -1, false, false, nullptr, &result, nullptr); + return result; } Mesh *mesh_create_eval_final_index_render(Depsgraph *depsgraph, @@ -2111,12 +2109,10 @@ Mesh *mesh_create_eval_final_index_render(Depsgraph *depsgraph, const CustomData_MeshMasks *dataMask, int index) { - Mesh *final; - + Mesh *result; mesh_calc_modifiers( - depsgraph, scene, ob, true, false, dataMask, index, false, false, nullptr, &final, nullptr); - - return final; + depsgraph, scene, ob, true, false, dataMask, index, false, false, nullptr, &result, nullptr); + return result; } Mesh *mesh_create_eval_no_deform(Depsgraph *depsgraph, @@ -2124,12 +2120,10 @@ Mesh *mesh_create_eval_no_deform(Depsgraph *depsgraph, Object *ob, const CustomData_MeshMasks *dataMask) { - Mesh *final; - + Mesh *result; mesh_calc_modifiers( - depsgraph, scene, ob, false, false, dataMask, -1, false, false, nullptr, &final, nullptr); - - return final; + depsgraph, scene, ob, false, false, dataMask, -1, false, false, nullptr, &result, nullptr); + return result; } Mesh *mesh_create_eval_no_deform_render(Depsgraph *depsgraph, @@ -2137,12 +2131,10 @@ Mesh *mesh_create_eval_no_deform_render(Depsgraph *depsgraph, Object *ob, const CustomData_MeshMasks *dataMask) { - Mesh *final; - + Mesh *result; mesh_calc_modifiers( - depsgraph, scene, ob, false, false, dataMask, -1, false, false, nullptr, &final, nullptr); - - return final; + depsgraph, scene, ob, false, false, dataMask, -1, false, false, nullptr, &result, nullptr); + return result; } /***/ |