kannonier8/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

[#20892] Locking animation curves with Tab Key don't hide the curves handles

Browse Source 
drawing handles for fcurves wasnt checking ((fcu->grp) && (fcu->grp->flag & AGRP_PROTECTED))
This commit is contained in:
Campbell Barton 2010-01-30 17:17:23 +00:00
parent 29377db3f1
commit 41861eecd1
1 changed files with 28 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -300,7 +300,7 @@ static void set_fcurve_vertex_color (SpaceIpo *sipo, FCurve *fcu, short sel)
}
void draw_fcurve_vertices (bAnimContext *ac, SpaceIpo *sipo, ARegion *ar, FCurve *fcu)
static void draw_fcurve_vertices (bAnimContext *ac, SpaceIpo *sipo, ARegion *ar, FCurve *fcu, int do_handles)
{
View2D *v2d= &ar->v2d;
@ -314,8 +314,7 @@ void draw_fcurve_vertices (bAnimContext *ac, SpaceIpo *sipo, ARegion *ar, FCurve
glPointSize(UI_GetThemeValuef(TH_VERTEX_SIZE));
/* draw the two handles first (if they're shown, the curve doesn't have just a single keyframe, and the curve is being edited) */
if ((fcu->flag & FCURVE_PROTECTED)==0 && (fcu->flag & FCURVE_INT_VALUES)==0 &&
(sipo->flag & SIPO_NOHANDLES)==0 && (fcu->totvert > 1))
if (do_handles)
{
set_fcurve_vertex_color(sipo, fcu, 0);
draw_fcurve_vertices_handles(ac, sipo, fcu, v2d, 0);
@ -336,16 +335,28 @@ void draw_fcurve_vertices (bAnimContext *ac, SpaceIpo *sipo, ARegion *ar, FCurve
/* Handles ---------------- */
/* draw lines for F-Curve handles only (this is only done in EditMode) */
static int draw_fcurve_handles_check(SpaceIpo *sipo, FCurve *fcu)
{
/* don't draw handle lines if handles are not shown */
if ( (sipo->flag & SIPO_NOHANDLES) ||
(fcu->flag & FCURVE_PROTECTED) ||
(fcu->flag & FCURVE_INT_VALUES) ||
((fcu->grp) && (fcu->grp->flag & AGRP_PROTECTED))
/* || (fcu->totvert <= 1) */
) {
return 0;
} else {
return 1;
}
}
/* draw lines for F-Curve handles only (this is only done in EditMode)
* note: draw_fcurve_handles_check must be checked before running this. */
static void draw_fcurve_handles (bAnimContext *ac, SpaceIpo *sipo, ARegion *ar, FCurve *fcu)
{
extern unsigned int nurbcol[];
int sel, b;
/* don't draw handle lines if handles are not shown */
if ((sipo->flag & SIPO_NOHANDLES) || (fcu->flag & FCURVE_PROTECTED) || (fcu->flag & FCURVE_INT_VALUES))
return;
/* a single call to GL_LINES here around these calls should be sufficient to still
* get separate line segments, but which aren't wrapped with GL_LINE_STRIP everytime we
* want a single line
@ -910,12 +921,16 @@ void graph_draw_curves (bAnimContext *ac, SpaceIpo *sipo, ARegion *ar, View2DGri
ANIM_unit_mapping_apply_fcurve(ac->scene, ale->id, fcu, 0);
if (fcu->bezt) {
/* only draw handles/vertices on keyframes */
glEnable(GL_BLEND);
int do_handles = draw_fcurve_handles_check(sipo, fcu);
if(do_handles) {
/* only draw handles/vertices on keyframes */
glEnable(GL_BLEND);
draw_fcurve_handles(ac, sipo, ar, fcu);
glDisable(GL_BLEND);
draw_fcurve_vertices(ac, sipo, ar, fcu);
glDisable(GL_BLEND);
}
draw_fcurve_vertices(ac, sipo, ar, fcu, do_handles);
}
else {
/* samples: only draw two indicators at either end as indicators */