diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2015-01-07 03:41:45 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2015-01-07 04:08:55 +0300 |
| commit | 29d2c71117809fea3c9d11a872e422b85847d93b (patch) | |
| tree | a30d561e7d95d5c5e307c00d7de98372a8ef5406 /source/blender/editors | |
| parent | 848c00f7e70950fa012627f84c89b32bb9a4deaa (diff) | |
Fix for bool flag use
Diffstat (limited to 'source/blender/editors')
| -rw-r--r-- | source/blender/editors/space_clip/clip_draw.c | 2 | ||||
| -rw-r--r-- | source/blender/editors/space_view3d/view3d_buttons.c | 2 | ||||
| -rw-r--r-- | source/blender/editors/transform/transform_conversions.c | 12 |
3 files changed, 8 insertions, 8 deletions
diff --git a/source/blender/editors/space_clip/clip_draw.c b/source/blender/editors/space_clip/clip_draw.c index 6f63979b8fa..6c55d8d034e 100644 --- a/source/blender/editors/space_clip/clip_draw.c +++ b/source/blender/editors/space_clip/clip_draw.c @@ -1122,7 +1122,7 @@ static void draw_plane_marker_ex(SpaceClip *sc, Scene *scene, MovieTrackingPlane bool draw_outline, int width, int height) { bool tiny = (sc->flag & SC_SHOW_TINY_MARKER) != 0; - bool is_selected_track = plane_track->flag & SELECT; + bool is_selected_track = (plane_track->flag & SELECT) != 0; bool draw_plane_quad = plane_track->image == NULL || plane_track->image_opacity == 0.0f; float px[2]; diff --git a/source/blender/editors/space_view3d/view3d_buttons.c b/source/blender/editors/space_view3d/view3d_buttons.c index 42b7f62c8d1..88f43ab340f 100644 --- a/source/blender/editors/space_view3d/view3d_buttons.c +++ b/source/blender/editors/space_view3d/view3d_buttons.c @@ -846,7 +846,7 @@ static void view3d_panel_vgroup(const bContext *C, Panel *pa) vgroup_validmap = BKE_object_defgroup_subset_from_select_type(ob, subset_type, &vgroup_tot, &subset_count); for (i = 0, dg = ob->defbase.first; dg; i++, dg = dg->next) { - bool locked = dg->flag & DG_LOCK_WEIGHT; + bool locked = (dg->flag & DG_LOCK_WEIGHT) != 0; if (vgroup_validmap[i]) { MDeformWeight *dw = defvert_find_index(dv, i); if (dw) { diff --git a/source/blender/editors/transform/transform_conversions.c b/source/blender/editors/transform/transform_conversions.c index 6e06f2e9d43..8d6aae46567 100644 --- a/source/blender/editors/transform/transform_conversions.c +++ b/source/blender/editors/transform/transform_conversions.c @@ -3831,9 +3831,9 @@ static void createTransGraphEditData(bContext *C, TransInfo *t) /* only include BezTriples whose 'keyframe' occurs on the same side of the current frame as mouse */ for (i = 0, bezt = fcu->bezt; i < fcu->totvert; i++, bezt++) { if (FrameOnMouseSide(t->frame_side, bezt->vec[1][0], cfra)) { - const bool sel2 = bezt->f2 & SELECT; - const bool sel1 = use_handle ? bezt->f1 & SELECT : sel2; - const bool sel3 = use_handle ? bezt->f3 & SELECT : sel2; + const bool sel2 = (bezt->f2 & SELECT) != 0; + const bool sel1 = use_handle ? (bezt->f1 & SELECT) != 0 : sel2; + const bool sel3 = use_handle ? (bezt->f3 & SELECT) != 0 : sel2; if (!is_translation_mode || !(sel2)) { if (sel1) { @@ -3917,9 +3917,9 @@ static void createTransGraphEditData(bContext *C, TransInfo *t) /* only include BezTriples whose 'keyframe' occurs on the same side of the current frame as mouse (if applicable) */ for (i = 0, bezt = fcu->bezt; i < fcu->totvert; i++, bezt++) { if (FrameOnMouseSide(t->frame_side, bezt->vec[1][0], cfra)) { - const bool sel2 = bezt->f2 & SELECT; - const bool sel1 = use_handle ? bezt->f1 & SELECT : sel2; - const bool sel3 = use_handle ? bezt->f3 & SELECT : sel2; + const bool sel2 = (bezt->f2 & SELECT) != 0; + const bool sel1 = use_handle ? (bezt->f1 & SELECT) != 0 : sel2; + const bool sel3 = use_handle ? (bezt->f3 & SELECT) != 0 : sel2; TransDataCurveHandleFlags *hdata = NULL; /* short h1=1, h2=1; */ /* UNUSED */ |