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

Silent compilation warning in space_graph.

Browse Source
This commit is contained in:
Jeroen Bakker
2022-01-28 11:41:08 +01:00
parent be921a04f2
commit 7c48196056
1 changed files with 8 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
source/blender/editors/space_graph/graph_draw.c
View File

@@ -437,7 +437,6 @@ static void draw_fcurve_handles(SpaceGraph *sipo, FCurve *fcu)
for (sel = 0; sel < 2; sel++) {
BezTriple *bezt = fcu->bezt, *prevbezt = NULL;
int basecol = (sel) ? TH_HANDLE_SEL_FREE : TH_HANDLE_FREE;
const float *fp;
uchar col[4];
for (b = 0; b < fcu->totvert; b++, prevbezt = bezt, bezt++) {
@@ -452,17 +451,15 @@ static void draw_fcurve_handles(SpaceGraph *sipo, FCurve *fcu)
/* draw handle with appropriate set of colors if selection is ok */
if ((bezt->f2 & SELECT) == sel) {
fp = bezt->vec[0];
/* only draw first handle if previous segment had handles */
if ((!prevbezt && (bezt->ipo == BEZT_IPO_BEZ)) ||
(prevbezt && (prevbezt->ipo == BEZT_IPO_BEZ))) {
UI_GetThemeColor3ubv(basecol + bezt->h1, col);
col[3] = fcurve_display_alpha(fcu) * 255;
immAttr4ubv(color, col);
immVertex2fv(pos, fp);
immVertex2fv(pos, bezt->vec[0]);
immAttr4ubv(color, col);
immVertex2fv(pos, fp + 3);
immVertex2fv(pos, bezt->vec[1]);
}
/* only draw second handle if this segment is bezier */
@@ -470,33 +467,31 @@ static void draw_fcurve_handles(SpaceGraph *sipo, FCurve *fcu)
UI_GetThemeColor3ubv(basecol + bezt->h2, col);
col[3] = fcurve_display_alpha(fcu) * 255;
immAttr4ubv(color, col);
immVertex2fv(pos, fp + 3);
immVertex2fv(pos, bezt->vec[1]);
immAttr4ubv(color, col);
immVertex2fv(pos, fp + 6);
immVertex2fv(pos, bezt->vec[2]);
}
}
else {
/* only draw first handle if previous segment was had handles, and selection is ok */
if (((bezt->f1 & SELECT) == sel) && ((!prevbezt && (bezt->ipo == BEZT_IPO_BEZ)) ||
(prevbezt && (prevbezt->ipo == BEZT_IPO_BEZ)))) {
fp = bezt->vec[0];
UI_GetThemeColor3ubv(basecol + bezt->h1, col);
col[3] = fcurve_display_alpha(fcu) * 255;
immAttr4ubv(color, col);
immVertex2fv(pos, fp);
immVertex2fv(pos, bezt->vec[0]);
immAttr4ubv(color, col);
immVertex2fv(pos, fp + 3);
immVertex2fv(pos, bezt->vec[1]);
}
/* only draw second handle if this segment is bezier, and selection is ok */
if (((bezt->f3 & SELECT) == sel) && (bezt->ipo == BEZT_IPO_BEZ)) {
fp = bezt->vec[1];
UI_GetThemeColor3ubv(basecol + bezt->h2, col);
col[3] = fcurve_display_alpha(fcu) * 255;
immAttr4ubv(color, col);
immVertex2fv(pos, fp);
immVertex2fv(pos, bezt->vec[0]);
immAttr4ubv(color, col);
immVertex2fv(pos, fp + 3);
immVertex2fv(pos, bezt->vec[1]);
}
}
}