Page MenuHome
Differential D2486

Converted clip_dopesheet_draw.c to new immediate mode. (Part of T49043)
ClosedPublic
Actions

Authored by Tobias Mertz (TCMBoby) on Jan 27 2017, 10:32 PM.

Details

Reviewers
Mike Erwin (merwin)
Maniphest Tasks
T49043: replace OpenGL immediate mode in Blender 2.8
Summary

Text of selected channels does not change colors, since blenfont does not use uniform colors.

Otherwise it should be good to go.

Diff Detail

Repository
rB Blender
Branch
blender2.8
Build Status
Buildable 419
Build 419: arc lint + arc unit

Event Timeline

Tobias Mertz (TCMBoby) updated this revision to Diff 8202.Jan 27 2017, 10:32 PM
Tobias Mertz (TCMBoby) retitled this revision from to Converted clip_dopesheet_draw.c to new immediate mode. (Part of T49043).
Tobias Mertz (TCMBoby) updated this object.
Tobias Mertz (TCMBoby) updated this object.Jan 27 2017, 10:38 PM
Tobias Mertz (TCMBoby) added a reviewer: Mike Erwin (merwin).
Tobias Mertz (TCMBoby) added a project: BF Blender: 2.8.
Tobias Mertz (TCMBoby) added a task: T49043: replace OpenGL immediate mode in Blender 2.8.Jan 28 2017, 3:10 PM
Mike Erwin (merwin) edited edge metadata.Jan 29 2017, 4:49 PM

Looks good! I can test it tomorrow.

Mike Erwin (merwin) requested changes to this revision.Jan 31 2017, 10:28 AM
Mike Erwin (merwin) edited edge metadata.

Looks good for the most part! One change needed for BLF compatibility.

source/blender/editors/space_clip/clip_dopesheet_draw.c
246–247

BTW I'm working on draw_keyframe_shape... I'll make sure this & that work well together.

343–347

Keep this (after immUnbindProgram), or update it to

UI_ThemeColor(sel ? TH_TEXT_HI : TH_TEXT);

BLF_draw still uses old-skool glColor. I'm working on that.

This revision now requires changes to proceed.Jan 31 2017, 10:28 AM
Tobias Mertz (TCMBoby) updated this revision to Diff 8219.Jan 31 2017, 9:15 PM
Tobias Mertz (TCMBoby) edited edge metadata.

Reverted color assignment for font drawing

Tobias Mertz (TCMBoby) marked an inline comment as done.Feb 1 2017, 7:57 PM
Mike Erwin (merwin) added a comment.Feb 1 2017, 8:41 PM

"arc patch D2486" fails for me. Somehow your earlier commit is not included, but I see its effects here...
Do you have commit rights? If so you can push these changes.
If not, either figure out how to fix in Phabricator/Arcanist or attach the final clip_dopesheet_draw.c here.

Tobias Mertz (TCMBoby) added a comment.Feb 1 2017, 9:19 PM

clip_dopesheet_draw.c11 KBDownload

I see, there was an error on my part. I'm new to Phabricator/Arcanist.
Since I don't have commit rights, here is the final version of clip_dopesheet_draw.c.
Sorry for the inconvenience.

Mike Erwin (merwin) accepted this revision.Feb 2 2017, 4:39 AM
Mike Erwin (merwin) edited edge metadata.
This revision is now accepted and ready to land.Feb 2 2017, 4:39 AM
Mike Erwin (merwin) closed this revision.Feb 2 2017, 6:00 AM

Minor inconvenience! committed to blender2.8

Mike Erwin (merwin) mentioned this in rB6c95e97e64fa: OpenGL: convert clip_dopesheet_draw to new imm mode.Feb 7 2017, 5:25 AM

Revision Contents
Changeset List

PathSize
source/
blender/
editors/
space_clip/
7 lines

Diff 8219

View Options

source/blender/editors/space_clip/clip_dopesheet_draw.c

Loading...