diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2015-06-04 08:28:26 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2015-06-04 08:41:27 +0300 |
| commit | 7a0f57cd01d337f6f3a9cf02ecece635551b881d (patch) | |
| tree | 91310121749e6985e9ef63a9013177bd36aceb9a /source/blender/modifiers | |
| parent | 896f08bde8cdb336814cb359be09d7c215ef37bd (diff) | |
Cleanup: clarify order of precedence: &/?
Diffstat (limited to 'source/blender/modifiers')
| -rw-r--r-- | source/blender/modifiers/intern/MOD_explode.c | 2 | ||||
| -rw-r--r-- | source/blender/modifiers/intern/MOD_screw.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/modifiers/intern/MOD_explode.c b/source/blender/modifiers/intern/MOD_explode.c index fa16ebbb5da..82600421736 100644 --- a/source/blender/modifiers/intern/MOD_explode.c +++ b/source/blender/modifiers/intern/MOD_explode.c @@ -771,7 +771,7 @@ static DerivedMesh *cutEdges(ExplodeModifierData *emd, DerivedMesh *dm) for (i = 0; i < curdupface; i++) { mf = CDDM_get_tessface(splitdm, i); - test_index_face(mf, &splitdm->faceData, i, (mf->flag & ME_FACE_SEL ? 4 : 3)); + test_index_face(mf, &splitdm->faceData, i, ((mf->flag & ME_FACE_SEL) ? 4 : 3)); } BLI_edgehash_free(edgehash, NULL); diff --git a/source/blender/modifiers/intern/MOD_screw.c b/source/blender/modifiers/intern/MOD_screw.c index 4fa86527334..ee23469a131 100644 --- a/source/blender/modifiers/intern/MOD_screw.c +++ b/source/blender/modifiers/intern/MOD_screw.c @@ -148,7 +148,7 @@ static DerivedMesh *applyModifier(ModifierData *md, Object *ob, unsigned int i, j; unsigned int i1, i2; unsigned int step_tot = use_render_params ? ltmd->render_steps : ltmd->steps; - const bool do_flip = ltmd->flag & MOD_SCREW_NORMAL_FLIP ? 1 : 0; + const bool do_flip = (ltmd->flag & MOD_SCREW_NORMAL_FLIP) != 0; const int quad_ord[4] = { do_flip ? 3 : 0, |