diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2013-12-22 07:11:10 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2013-12-22 07:12:19 +0400 |
| commit | c1c26c36f62c3bfdb40b01f33004695a09ce2f4d (patch) | |
| tree | 21e738fefe0c7d77af7c1129bcdfef65e1a8f655 /source/blender/modifiers/intern | |
| parent | 5eb96d4705b93a7049ecabd0827e0e58b28a2838 (diff) | |
Style Cleanup: remove preprocessor indentation (updated wiki style guide too)
Diffstat (limited to 'source/blender/modifiers/intern')
| -rw-r--r-- | source/blender/modifiers/intern/MOD_array.c | 4 | ||||
| -rw-r--r-- | source/blender/modifiers/intern/MOD_ocean.c | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/source/blender/modifiers/intern/MOD_array.c b/source/blender/modifiers/intern/MOD_array.c index 2bf7bb5f672..971b3f0cd14 100644 --- a/source/blender/modifiers/intern/MOD_array.c +++ b/source/blender/modifiers/intern/MOD_array.c @@ -469,7 +469,7 @@ static DerivedMesh *arrayModifier_doArray(ArrayModifierData *amd, amd, &index_len); } - #define _E(s, i) ((BMVert **)(s)->data.buf)[i] +#define _E(s, i) ((BMVert **)(s)->data.buf)[i] /* ensure this is set */ BLI_assert(index_len != -1); @@ -490,7 +490,7 @@ static DerivedMesh *arrayModifier_doArray(ArrayModifierData *amd, BMO_slot_map_elem_insert(&weld_op, slot_targetmap, v, v2); } - #undef _E +#undef _E } /* already copied earlier, but after executation more slot diff --git a/source/blender/modifiers/intern/MOD_ocean.c b/source/blender/modifiers/intern/MOD_ocean.c index 40a4d5e0986..e5d9a9dae0e 100644 --- a/source/blender/modifiers/intern/MOD_ocean.c +++ b/source/blender/modifiers/intern/MOD_ocean.c @@ -317,7 +317,7 @@ static DerivedMesh *generate_ocean_geometry(OceanModifierData *omd) origindex = CustomData_get_layer(&result->polyData, CD_ORIGINDEX); /* create vertices */ - #pragma omp parallel for private(x, y) if (rx > OMP_MIN_RES) +#pragma omp parallel for private(x, y) if (rx > OMP_MIN_RES) for (y = 0; y <= res_y; y++) { for (x = 0; x <= res_x; x++) { const int i = y * (res_x + 1) + x; @@ -329,7 +329,7 @@ static DerivedMesh *generate_ocean_geometry(OceanModifierData *omd) } /* create faces */ - #pragma omp parallel for private(x, y) if (rx > OMP_MIN_RES) +#pragma omp parallel for private(x, y) if (rx > OMP_MIN_RES) for (y = 0; y < res_y; y++) { for (x = 0; x < res_x; x++) { const int fi = y * res_x + x; @@ -367,7 +367,7 @@ static DerivedMesh *generate_ocean_geometry(OceanModifierData *omd) if (mloopuvs) { /* unlikely to fail */ ix = 1.0 / rx; iy = 1.0 / ry; - #pragma omp parallel for private(x, y) if (rx > OMP_MIN_RES) +#pragma omp parallel for private(x, y) if (rx > OMP_MIN_RES) for (y = 0; y < res_y; y++) { for (x = 0; x < res_x; x++) { const int i = y * res_x + x; |