diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2018-05-08 17:57:07 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2018-05-08 17:57:07 +0300 |
| commit | fa69ce9e3a682426aa0d247f4720571889d5a6c2 (patch) | |
| tree | eacdf128815663264471c4c66b226ecf4206c77e /source/blender/blenkernel/intern | |
| parent | 5b3559576de5d9896ca2a7f200e1e51ee0fc8af5 (diff) | |
Cleanup: whitespace, duplicate includes
Diffstat (limited to 'source/blender/blenkernel/intern')
| -rw-r--r-- | source/blender/blenkernel/intern/mesh.c | 14 | ||||
| -rw-r--r-- | source/blender/blenkernel/intern/modifier.c | 8 |
2 files changed, 11 insertions, 11 deletions
diff --git a/source/blender/blenkernel/intern/mesh.c b/source/blender/blenkernel/intern/mesh.c index fd66b8faf77..4fe2c3bf1ec 100644 --- a/source/blender/blenkernel/intern/mesh.c +++ b/source/blender/blenkernel/intern/mesh.c @@ -51,7 +51,6 @@ #include "BKE_main.h" #include "BKE_DerivedMesh.h" #include "BKE_global.h" -#include "BKE_idcode.h" #include "BKE_mesh.h" #include "BKE_mesh_mapping.h" #include "BKE_displist.h" @@ -615,13 +614,14 @@ void BKE_mesh_copy_data(Main *bmain, Mesh *me_dst, const Mesh *me_src, const int } } -Mesh *BKE_mesh_new_nomain(int numVerts, int numEdges, int numTessFaces,int numLoops, int numPolys) +Mesh *BKE_mesh_new_nomain(int numVerts, int numEdges, int numTessFaces, int numLoops, int numPolys) { - Mesh *mesh = BKE_libblock_alloc(NULL, ID_ME, - BKE_idcode_to_name(ID_ME), - LIB_ID_CREATE_NO_MAIN | - LIB_ID_CREATE_NO_USER_REFCOUNT | - LIB_ID_CREATE_NO_DEG_TAG); + Mesh *mesh = BKE_libblock_alloc( + NULL, ID_ME, + BKE_idcode_to_name(ID_ME), + LIB_ID_CREATE_NO_MAIN | + LIB_ID_CREATE_NO_USER_REFCOUNT | + LIB_ID_CREATE_NO_DEG_TAG); BKE_libblock_init_empty(&mesh->id); /* don't use CustomData_reset(...); because we dont want to touch customdata */ diff --git a/source/blender/blenkernel/intern/modifier.c b/source/blender/blenkernel/intern/modifier.c index 54e5848c2e6..8049c23c439 100644 --- a/source/blender/blenkernel/intern/modifier.c +++ b/source/blender/blenkernel/intern/modifier.c @@ -962,7 +962,7 @@ struct Mesh *modifier_applyModifier(struct ModifierData *md, const ModifierEvalC DerivedMesh *ndm = mti->applyModifier_DM(md, ctx, dm); - if(ndm != dm) { + if (ndm != dm) { dm->release(dm); } @@ -986,7 +986,7 @@ struct Mesh *modifier_applyModifierEM(struct ModifierData *md, const ModifierEva DerivedMesh *ndm = mti->applyModifierEM_DM(md, ctx, editData, dm); - if(ndm != dm) { + if (ndm != dm) { dm->release(dm); } @@ -1120,7 +1120,7 @@ struct DerivedMesh *modifier_applyModifier_DM_deprecated(struct ModifierData *md /* Make a DM that doesn't reference new_mesh so we can free the latter. */ DerivedMesh *ndm = CDDM_from_mesh_ex(new_mesh, CD_DUPLICATE); - if(new_mesh != mesh) { + if (new_mesh != mesh) { BKE_id_free(NULL, new_mesh); } if (mesh != NULL) { @@ -1153,7 +1153,7 @@ struct DerivedMesh *modifier_applyModifierEM_DM_deprecated(struct ModifierData * /* Make a DM that doesn't reference new_mesh so we can free the latter. */ DerivedMesh *ndm = CDDM_from_mesh_ex(new_mesh, CD_DUPLICATE); - if(new_mesh != mesh) { + if (new_mesh != mesh) { BKE_id_free(NULL, new_mesh); } if (mesh != NULL) { |