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/modifiers | |
parent | 5b3559576de5d9896ca2a7f200e1e51ee0fc8af5 (diff) |
Cleanup: whitespace, duplicate includes
Diffstat (limited to 'source/blender/modifiers')
-rw-r--r-- | source/blender/modifiers/intern/MOD_build.c | 6 | ||||
-rw-r--r-- | source/blender/modifiers/intern/MOD_normal_edit.c | 12 | ||||
-rw-r--r-- | source/blender/modifiers/intern/MOD_particleinstance.c | 2 | ||||
-rw-r--r-- | source/blender/modifiers/intern/MOD_util.c | 12 | ||||
-rw-r--r-- | source/blender/modifiers/intern/MOD_weightvgedit.c | 12 | ||||
-rw-r--r-- | source/blender/modifiers/intern/MOD_weightvgmix.c | 12 | ||||
-rw-r--r-- | source/blender/modifiers/intern/MOD_weightvgproximity.c | 12 |
7 files changed, 31 insertions, 37 deletions
diff --git a/source/blender/modifiers/intern/MOD_build.c b/source/blender/modifiers/intern/MOD_build.c index f9cd57cc460..7cb573c9e45 100644 --- a/source/blender/modifiers/intern/MOD_build.c +++ b/source/blender/modifiers/intern/MOD_build.c @@ -52,12 +52,6 @@ #include "BKE_particle.h" #include "BKE_scene.h" - - -#ifdef _OPENMP -# include "BKE_mesh.h" /* BKE_MESH_OMP_LIMIT */ -#endif - static void initData(ModifierData *md) { BuildModifierData *bmd = (BuildModifierData *) md; diff --git a/source/blender/modifiers/intern/MOD_normal_edit.c b/source/blender/modifiers/intern/MOD_normal_edit.c index 9d2a66e0a06..67d20e1a52f 100644 --- a/source/blender/modifiers/intern/MOD_normal_edit.c +++ b/source/blender/modifiers/intern/MOD_normal_edit.c @@ -406,12 +406,12 @@ static Mesh *normalEditModifier_do(NormalEditModifierData *enmd, Object *ob, Mes Mesh *result; BKE_id_copy_ex( - NULL, &mesh->id, (ID **)&result, - LIB_ID_CREATE_NO_MAIN | - LIB_ID_CREATE_NO_USER_REFCOUNT | - LIB_ID_CREATE_NO_DEG_TAG| - LIB_ID_COPY_NO_PREVIEW, - false); + NULL, &mesh->id, (ID **)&result, + LIB_ID_CREATE_NO_MAIN | + LIB_ID_CREATE_NO_USER_REFCOUNT | + LIB_ID_CREATE_NO_DEG_TAG | + LIB_ID_COPY_NO_PREVIEW, + false); const int num_verts = result->totvert; const int num_edges = result->totedge; diff --git a/source/blender/modifiers/intern/MOD_particleinstance.c b/source/blender/modifiers/intern/MOD_particleinstance.c index b87705adb6b..5b03677ad93 100644 --- a/source/blender/modifiers/intern/MOD_particleinstance.c +++ b/source/blender/modifiers/intern/MOD_particleinstance.c @@ -205,7 +205,7 @@ static DerivedMesh *applyModifier(ModifierData *md, const ModifierEvalContext *c MPoly *mpoly, *orig_mpoly; MLoop *mloop, *orig_mloop; MVert *mvert, *orig_mvert; - int totvert, totpoly, totloop , totedge; + int totvert, totpoly, totloop, totedge; int maxvert, maxpoly, maxloop, maxedge, part_end = 0, part_start; int k, p, p_skip; short track = ctx->object->trackflag % 3, trackneg, axis = pimd->axis; diff --git a/source/blender/modifiers/intern/MOD_util.c b/source/blender/modifiers/intern/MOD_util.c index 195043c8ff8..a34725d1c69 100644 --- a/source/blender/modifiers/intern/MOD_util.c +++ b/source/blender/modifiers/intern/MOD_util.c @@ -38,7 +38,6 @@ #include "DNA_modifier_types.h" #include "DNA_object_types.h" #include "DNA_scene_types.h" -#include "DNA_scene_types.h" #include "BLI_utildefines.h" #include "BLI_math_vector.h" @@ -301,11 +300,12 @@ Mesh *get_mesh(Object *ob, struct BMEditMesh *em, Mesh *mesh, struct BMeshToMeshParams bmtmp = {0}; if (em) mesh = BKE_bmesh_to_mesh_nomain(em->bm, &bmtmp); else { - BKE_id_copy_ex(NULL, ob->data, (ID **)&mesh, - LIB_ID_CREATE_NO_MAIN | - LIB_ID_CREATE_NO_USER_REFCOUNT | - LIB_ID_CREATE_NO_DEG_TAG, - false); + BKE_id_copy_ex( + NULL, ob->data, (ID **)&mesh, + LIB_ID_CREATE_NO_MAIN | + LIB_ID_CREATE_NO_USER_REFCOUNT | + LIB_ID_CREATE_NO_DEG_TAG, + false); } if (vertexCos) { diff --git a/source/blender/modifiers/intern/MOD_weightvgedit.c b/source/blender/modifiers/intern/MOD_weightvgedit.c index f37afc58e20..60ff36d7a68 100644 --- a/source/blender/modifiers/intern/MOD_weightvgedit.c +++ b/source/blender/modifiers/intern/MOD_weightvgedit.c @@ -203,12 +203,12 @@ static Mesh *applyModifier(ModifierData *md, Mesh *result; BKE_id_copy_ex( - NULL, &mesh->id, (ID **)&result, - LIB_ID_CREATE_NO_MAIN | - LIB_ID_CREATE_NO_USER_REFCOUNT | - LIB_ID_CREATE_NO_DEG_TAG| - LIB_ID_COPY_NO_PREVIEW, - false); + NULL, &mesh->id, (ID **)&result, + LIB_ID_CREATE_NO_MAIN | + LIB_ID_CREATE_NO_USER_REFCOUNT | + LIB_ID_CREATE_NO_DEG_TAG | + LIB_ID_COPY_NO_PREVIEW, + false); if (has_mdef) { dvert = CustomData_get_layer(&result->vdata, CD_MDEFORMVERT); diff --git a/source/blender/modifiers/intern/MOD_weightvgmix.c b/source/blender/modifiers/intern/MOD_weightvgmix.c index be73ff96496..448e74371b5 100644 --- a/source/blender/modifiers/intern/MOD_weightvgmix.c +++ b/source/blender/modifiers/intern/MOD_weightvgmix.c @@ -245,12 +245,12 @@ static Mesh *applyModifier(ModifierData *md, const ModifierEvalContext *ctx, Mes Mesh *result; BKE_id_copy_ex( - NULL, &mesh->id, (ID **)&result, - LIB_ID_CREATE_NO_MAIN | - LIB_ID_CREATE_NO_USER_REFCOUNT | - LIB_ID_CREATE_NO_DEG_TAG| - LIB_ID_COPY_NO_PREVIEW, - false); + NULL, &mesh->id, (ID **)&result, + LIB_ID_CREATE_NO_MAIN | + LIB_ID_CREATE_NO_USER_REFCOUNT | + LIB_ID_CREATE_NO_DEG_TAG | + LIB_ID_COPY_NO_PREVIEW, + false); if (has_mdef) { dvert = CustomData_get_layer(&result->vdata, CD_MDEFORMVERT); diff --git a/source/blender/modifiers/intern/MOD_weightvgproximity.c b/source/blender/modifiers/intern/MOD_weightvgproximity.c index 7985f4d7647..ace381917bc 100644 --- a/source/blender/modifiers/intern/MOD_weightvgproximity.c +++ b/source/blender/modifiers/intern/MOD_weightvgproximity.c @@ -426,12 +426,12 @@ static Mesh *applyModifier(ModifierData *md, const ModifierEvalContext *ctx, Mes Mesh *result; BKE_id_copy_ex( - NULL, &mesh->id, (ID **)&result, - LIB_ID_CREATE_NO_MAIN | - LIB_ID_CREATE_NO_USER_REFCOUNT | - LIB_ID_CREATE_NO_DEG_TAG| - LIB_ID_COPY_NO_PREVIEW, - false); + NULL, &mesh->id, (ID **)&result, + LIB_ID_CREATE_NO_MAIN | + LIB_ID_CREATE_NO_USER_REFCOUNT | + LIB_ID_CREATE_NO_DEG_TAG | + LIB_ID_COPY_NO_PREVIEW, + false); if (has_mdef) { dvert = CustomData_get_layer(&result->vdata, CD_MDEFORMVERT); |