Commit: 5678691fe45ea63073f762f806bc1885440060bc Author: Campbell Barton Date: Tue Feb 3 09:32:19 2015 +1100 Branches: master https://developer.blender.org/rB5678691fe45ea63073f762f806bc1885440060bc
cleanup: use bools in drawobject =================================================================== M source/blender/editors/space_view3d/drawobject.c =================================================================== diff --git a/source/blender/editors/space_view3d/drawobject.c b/source/blender/editors/space_view3d/drawobject.c index 0d0ef72..81f4dce 100644 --- a/source/blender/editors/space_view3d/drawobject.c +++ b/source/blender/editors/space_view3d/drawobject.c @@ -732,7 +732,7 @@ void drawcircball(int mode, const float cent[3], float rad, float tmat[4][4]) } /* circle for object centers, special_color is for library or ob users */ -static void drawcentercircle(View3D *v3d, RegionView3D *rv3d, const float co[3], int selstate, int special_color) +static void drawcentercircle(View3D *v3d, RegionView3D *rv3d, const float co[3], int selstate, bool special_color) { const float size = ED_view3d_pixel_size(rv3d, co) * (float)U.obcenter_dia * 0.5f; float verts[CIRCLE_RESOL][3]; @@ -4328,8 +4328,8 @@ static bool drawDispList_nobackface(Scene *scene, View3D *v3d, RegionView3D *rv3 ListBase *lb = NULL; DispList *dl; Curve *cu; - const short render_only = (v3d->flag2 & V3D_RENDER_OVERRIDE); - const short solid = (dt > OB_WIRE); + const bool render_only = (v3d->flag2 & V3D_RENDER_OVERRIDE) != 0; + const bool solid = (dt > OB_WIRE); if (drawCurveDerivedMesh(scene, v3d, rv3d, base, dt) == false) { return false; @@ -7855,7 +7855,7 @@ void draw_object(Scene *scene, ARegion *ar, View3D *v3d, Base *base, const short if (render_override) { /* don't draw */ } - else if ((scene->basact) == base) + else if (is_obact) do_draw_center = ACTIVE; else if (base->flag & SELECT) do_draw_center = SELECT; _______________________________________________ Bf-blender-cvs mailing list Bf-blender-cvs@blender.org http://lists.blender.org/mailman/listinfo/bf-blender-cvs