blender
/
blender
129
397
Fork 571
Code Issues 6.2k Pull Requests 753 Projects 19 Wiki Activity

No need for while-loop counting curve-normals

This commit is contained in:
Campbell Barton 2017-04-20 02:51:03 +10:00
parent e28a92bacb
commit 43a273616b
1 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -7345,14 +7345,20 @@ static void draw_editnurb(
glLineWidth(1.0f);
int count = 0;
int count_used = 0;
for (bl = ob->curve_cache->bev.first, nu = nurb; nu && bl; bl = bl->next, nu = nu->next) {
int nr = bl->nr;
int skip = nu->resolu / 16;
#if 0
while (nr-- > 0) { /* accounts for empty bevel lists */
count += 4;
nr -= skip;
}
#else
/* Same as loop above */
count += 4 * max_ii((nr + max_ii(skip - 1, 0)) / (skip + 1), 0);
#endif
}
if (count > 2) {
@ -7361,7 +7367,7 @@ static void draw_editnurb(
BevPoint *bevp = bl->bevpoints;
int nr = bl->nr;
int skip = nu->resolu / 16;
while (nr-- > 0) { /* accounts for empty bevel lists */
const float fac = bevp->radius * ts->normalsize;
float vec_a[3]; /* Offset perpendicular to the curve */
@ -7390,8 +7396,12 @@ static void draw_editnurb(
bevp += skip + 1;
nr -= skip;
count_used += 4;
}
}
BLI_assert(count == count_used);
UNUSED_VARS_NDEBUG(count_used);
immEnd();
}
immUnbindProgram();