Page MenuHome
Differential D2351 Diff 7794 source/blender/editors/space_action/action_draw.c

Changeset View

Standalone View

View Options

source/blender/editors/space_action/action_draw.c

Context not available.
#include "ED_keyframes_draw.h" #include "ED_keyframes_draw.h"
#include "action_intern.h" #include "action_intern.h"
#include "GPU_immediate.h"
/* ************************************************************************* */ /* ************************************************************************* */
/* Channel List */ /* Channel List */
Context not available.
/* first backdrop strips */ /* first backdrop strips */
y = (float)(-ACHANNEL_HEIGHT(ac)); y = (float)(-ACHANNEL_HEIGHT(ac));
VertexFormat* format = immVertexFormat();
unsigned pos = add_attrib(format, "pos", GL_FLOAT, 2, KEEP_FLOAT);
immBindBuiltinProgram(GPU_SHADER_2D_UNIFORM_COLOR);
glEnable(GL_BLEND); glEnable(GL_BLEND);
for (ale = anim_data.first; ale; ale = ale->next) { for (ale = anim_data.first; ale; ale = ale->next) {
Context not available.
case ANIMTYPE_SCENE: case ANIMTYPE_SCENE:
case ANIMTYPE_OBJECT: case ANIMTYPE_OBJECT:
{ {
if (sel) glColor4ub(col1b[0], col1b[1], col1b[2], 0x45); if (sel) immUniformColor4ub(col1b[0], col1b[1], col1b[2], 0x45);
else glColor4ub(col1b[0], col1b[1], col1b[2], 0x22); else immUniformColor4ub(col1b[0], col1b[1], col1b[2], 0x22);
break; break;
} }
case ANIMTYPE_FILLACTD: case ANIMTYPE_FILLACTD:
case ANIMTYPE_DSSKEY: case ANIMTYPE_DSSKEY:
case ANIMTYPE_DSWOR: case ANIMTYPE_DSWOR:
{ {
if (sel) glColor4ub(col2b[0], col2b[1], col2b[2], 0x45); if (sel) immUniformColor4ub(col2b[0], col2b[1], col2b[2], 0x45);
else glColor4ub(col2b[0], col2b[1], col2b[2], 0x22); else immUniformColor4ub(col2b[0], col2b[1], col2b[2], 0x22);
merwinUnsubmitted
Not Done
Inline Actions

These 4 lines have an extra space after the ;

Not sure if it was there before your change. Either way this is a good opportunity to fix it :)

merwin: These 4 lines have an extra space after the ; Not sure if it was there before your change.
break; break;
} }
case ANIMTYPE_GROUP: case ANIMTYPE_GROUP:
{ {
if (sel) glColor4ub(col1a[0], col1a[1], col1a[2], 0x22); if (sel) immUniformColor4ub(col1a[0], col1a[1], col1a[2], 0x22);
else glColor4ub(col2a[0], col2a[1], col2a[2], 0x22); else immUniformColor4ub(col2a[0], col2a[1], col2a[2], 0x22);
break; break;
} }
default: default:
{ {
if (sel) glColor4ub(col1[0], col1[1], col1[2], 0x22); if (sel) immUniformColor4ub(col1[0], col1[1], col1[2], 0x22);
else glColor4ub(col2[0], col2[1], col2[2], 0x22); else immUniformColor4ub(col2[0], col2[1], col2[2], 0x22);
break; break;
} }
} }
/* draw region twice: firstly backdrop, then the current range */ /* draw region twice: firstly backdrop, then the current range */
glRectf(v2d->cur.xmin, (float)y - ACHANNEL_HEIGHT_HALF(ac), v2d->cur.xmax + EXTRA_SCROLL_PAD, (float)y + ACHANNEL_HEIGHT_HALF(ac)); immRectf(pos, v2d->cur.xmin, (float)y - ACHANNEL_HEIGHT_HALF(ac), v2d->cur.xmax + EXTRA_SCROLL_PAD, (float)y + ACHANNEL_HEIGHT_HALF(ac));
if (ac->datatype == ANIMCONT_ACTION) if (ac->datatype == ANIMCONT_ACTION)
glRectf(act_start, (float)y - ACHANNEL_HEIGHT_HALF(ac), act_end, (float)y + ACHANNEL_HEIGHT_HALF(ac)); immRectf(pos, act_start, (float)y - ACHANNEL_HEIGHT_HALF(ac), act_end, (float)y + ACHANNEL_HEIGHT_HALF(ac));
} }
else if (ac->datatype == ANIMCONT_GPENCIL) { else if (ac->datatype == ANIMCONT_GPENCIL) {
/* frames less than one get less saturated background */ /* frames less than one get less saturated background */
if (sel) glColor4ub(col1[0], col1[1], col1[2], 0x22); if (sel) immUniformColor4ub(col1[0], col1[1], col1[2], 0x22);
else glColor4ub(col2[0], col2[1], col2[2], 0x22); else immUniformColor4ub(col2[0], col2[1], col2[2], 0x22);
glRectf(0.0f, (float)y - ACHANNEL_HEIGHT_HALF(ac), v2d->cur.xmin, (float)y + ACHANNEL_HEIGHT_HALF(ac)); immRectf(pos, 0.0f, (float)y - ACHANNEL_HEIGHT_HALF(ac), v2d->cur.xmin, (float)y + ACHANNEL_HEIGHT_HALF(ac));
/* frames one and higher get a saturated background */ /* frames one and higher get a saturated background */
if (sel) glColor4ub(col1[0], col1[1], col1[2], 0x44); if (sel) immUniformColor4ub(col1[0], col1[1], col1[2], 0x44);
else glColor4ub(col2[0], col2[1], col2[2], 0x44); else immUniformColor4ub(col2[0], col2[1], col2[2], 0x44);
glRectf(v2d->cur.xmin, (float)y - ACHANNEL_HEIGHT_HALF(ac), v2d->cur.xmax + EXTRA_SCROLL_PAD, (float)y + ACHANNEL_HEIGHT_HALF(ac)); immRectf(pos, v2d->cur.xmin, (float)y - ACHANNEL_HEIGHT_HALF(ac), v2d->cur.xmax + EXTRA_SCROLL_PAD, (float)y + ACHANNEL_HEIGHT_HALF(ac));
} }
else if (ac->datatype == ANIMCONT_MASK) { else if (ac->datatype == ANIMCONT_MASK) {
/* TODO --- this is a copy of gpencil */ /* TODO --- this is a copy of gpencil */
/* frames less than one get less saturated background */ /* frames less than one get less saturated background */
if (sel) glColor4ub(col1[0], col1[1], col1[2], 0x22); if (sel) immUniformColor4ub(col1[0], col1[1], col1[2], 0x22);
else glColor4ub(col2[0], col2[1], col2[2], 0x22); else immUniformColor4ub(col2[0], col2[1], col2[2], 0x22);
glRectf(0.0f, (float)y - ACHANNEL_HEIGHT_HALF(ac), v2d->cur.xmin, (float)y + ACHANNEL_HEIGHT_HALF(ac)); immRectf(pos, 0.0f, (float)y - ACHANNEL_HEIGHT_HALF(ac), v2d->cur.xmin, (float)y + ACHANNEL_HEIGHT_HALF(ac));
/* frames one and higher get a saturated background */ /* frames one and higher get a saturated background */
if (sel) glColor4ub(col1[0], col1[1], col1[2], 0x44); if (sel) immUniformColor4ub(col1[0], col1[1], col1[2], 0x44);
else glColor4ub(col2[0], col2[1], col2[2], 0x44); else immUniformColor4ub(col2[0], col2[1], col2[2], 0x44);
glRectf(v2d->cur.xmin, (float)y - ACHANNEL_HEIGHT_HALF(ac), v2d->cur.xmax + EXTRA_SCROLL_PAD, (float)y + ACHANNEL_HEIGHT_HALF(ac)); immRectf(pos, v2d->cur.xmin, (float)y - ACHANNEL_HEIGHT_HALF(ac), v2d->cur.xmax + EXTRA_SCROLL_PAD, (float)y + ACHANNEL_HEIGHT_HALF(ac));
} }
} }
} }
Context not available.
/* black line marking 'current frame' for Time-Slide transform mode */ /* black line marking 'current frame' for Time-Slide transform mode */
if (saction->flag & SACTION_MOVING) { if (saction->flag & SACTION_MOVING) {
glColor3f(0.0f, 0.0f, 0.0f); immUniformColor3f(0.0f, 0.0f, 0.0f);
glBegin(GL_LINES); immBegin(GL_LINES, 2);
glVertex2f(saction->timeslide, v2d->cur.ymin - EXTRA_SCROLL_PAD); immVertex2f(pos, saction->timeslide, v2d->cur.ymin - EXTRA_SCROLL_PAD);
glVertex2f(saction->timeslide, v2d->cur.ymax); immVertex2f(pos, saction->timeslide, v2d->cur.ymax);
glEnd(); immEnd();
} }
immUnbindProgram();
} }
Context not available.