archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Rename drawnurb -> draw_editnurb

Browse Source 
Since its only used for editmode drawing.
This commit is contained in:
Campbell Barton
2014-08-26 12:18:17 +10:00
parent e2c412f8cc
commit 6cc38ec7f6
1 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
source/blender/editors/space_view3d/drawobject.c
View File

@@ -5881,7 +5881,7 @@ static void editnurb_draw_active_nurbs(Nurb *nu)
glLineWidth(1); glLineWidth(1);
} }
static void draw_editnurb(Object *ob, Nurb *nurb, int sel) static void draw_editnurb_splines(Object *ob, Nurb *nurb, const bool sel)
{ {
Nurb *nu; Nurb *nu;
BPoint *bp, *bp1; BPoint *bp, *bp1;
@@ -5997,8 +5997,9 @@ static void draw_editnurb(Object *ob, Nurb *nurb, int sel)
} }
} }
static void drawnurb(Scene *scene, View3D *v3d, RegionView3D *rv3d, Base *base, Nurb *nurb, static void draw_editnurb(
const char dt, const short dflag, const unsigned char ob_wire_col[4]) Scene *scene, View3D *v3d, RegionView3D *rv3d, Base *base, Nurb *nurb,
const char dt, const short dflag, const unsigned char ob_wire_col[4])
{ {
ToolSettings *ts = scene->toolsettings; ToolSettings *ts = scene->toolsettings;
Object *ob = base->object; Object *ob = base->object;
@@ -6028,8 +6029,8 @@ static void drawnurb(Scene *scene, View3D *v3d, RegionView3D *rv3d, Base *base,
} }
index++; index++;
} }
draw_editnurb(ob, nurb, 0); draw_editnurb_splines(ob, nurb, false);
draw_editnurb(ob, nurb, 1); draw_editnurb_splines(ob, nurb, true);
/* selected handles */ /* selected handles */
for (nu = nurb; nu; nu = nu->next) { for (nu = nurb; nu; nu = nu->next) {
if (nu->type == CU_BEZIER && (cu->drawflag & CU_HIDE_HANDLES) == 0) if (nu->type == CU_BEZIER && (cu->drawflag & CU_HIDE_HANDLES) == 0)
@@ -7325,7 +7326,7 @@ void draw_object(Scene *scene, ARegion *ar, View3D *v3d, Base *base, const short
if (cu->editnurb) { if (cu->editnurb) {
ListBase *nurbs = BKE_curve_editNurbs_get(cu); ListBase *nurbs = BKE_curve_editNurbs_get(cu);
drawnurb(scene, v3d, rv3d, base, nurbs->first, dt, dflag, ob_wire_col); draw_editnurb(scene, v3d, rv3d, base, nurbs->first, dt, dflag, ob_wire_col);
} }
else if (dt == OB_BOUNDBOX) { else if (dt == OB_BOUNDBOX) {
if ((render_override && (v3d->drawtype >= OB_WIRE)) == 0) { if ((render_override && (v3d->drawtype >= OB_WIRE)) == 0) {