diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2012-03-31 07:36:15 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2012-03-31 07:36:15 +0400 |
| commit | f3792b0f2b37be665e70f94bcf2bbbe152bdf0ff (patch) | |
| tree | a4cbdb9a29e86ab116697ce6efecbf928ff2ae69 /source/blender/blenkernel | |
| parent | 5b88712ff932fcbcd0bb0fb257e8e9c2e247a82a (diff) | |
code cleanup: use uppercase for defines and dont end macro's with ;
Diffstat (limited to 'source/blender/blenkernel')
| -rw-r--r-- | source/blender/blenkernel/intern/fmodifier.c | 2 | ||||
| -rw-r--r-- | source/blender/blenkernel/intern/mesh.c | 10 |
2 files changed, 7 insertions, 5 deletions
diff --git a/source/blender/blenkernel/intern/fmodifier.c b/source/blender/blenkernel/intern/fmodifier.c index bbd07693cea..ed5cf5e7924 100644 --- a/source/blender/blenkernel/intern/fmodifier.c +++ b/source/blender/blenkernel/intern/fmodifier.c @@ -335,7 +335,7 @@ static void fcm_fn_generator_evaluate (FCurve *UNUSED(fcu), FModifier *fcm, floa case FCM_GENERATOR_FN_TAN: /* tangent wave */ { /* check that argument is not on one of the discontinuities (i.e. 90deg, 270 deg, etc) */ - if IS_EQ(fmod((arg - M_PI_2), M_PI), 0.0) { + if (IS_EQ(fmod((arg - M_PI_2), M_PI), 0.0)) { if ((data->flag & FCM_GENERATOR_ADDITIVE) == 0) *cvalue = 0.0f; /* no value possible here */ } diff --git a/source/blender/blenkernel/intern/mesh.c b/source/blender/blenkernel/intern/mesh.c index ed2b71cdb52..ea061c99156 100644 --- a/source/blender/blenkernel/intern/mesh.c +++ b/source/blender/blenkernel/intern/mesh.c @@ -2406,6 +2406,7 @@ int mesh_recalcTessellation(CustomData *fdata, BLI_array_append(mface_orig_index, \ poly_orig_index[poly_index]); \ } \ + (void)0 /* ALMOST IDENTICAL TO DEFINE ABOVE (see EXCEPTION) */ #define ML_TO_MF_QUAD() \ @@ -2425,20 +2426,21 @@ int mesh_recalcTessellation(CustomData *fdata, poly_orig_index[poly_index]); \ } \ mf->edcode |= TESSFACE_IS_QUAD; /* EXCEPTION */ \ + (void)0 else if (mp->totloop == 3) { - ML_TO_MF(0, 1, 2) + ML_TO_MF(0, 1, 2); mface_index++; } else if (mp->totloop == 4) { #ifdef USE_TESSFACE_QUADS - ML_TO_MF_QUAD() + ML_TO_MF_QUAD(); mface_index++; #else - ML_TO_MF(0, 1, 2) + ML_TO_MF(0, 1, 2); mface_index++; - ML_TO_MF(0, 2, 3) + ML_TO_MF(0, 2, 3); mface_index++; #endif } |