diff options
| author | Bastien Montagne <montagne29@wanadoo.fr> | 2017-04-26 13:17:46 +0300 |
|---|---|---|
| committer | Bastien Montagne <montagne29@wanadoo.fr> | 2017-04-26 13:17:46 +0300 |
| commit | 8de3778d11bf60dcee7bd38de0f5f648f2be7333 (patch) | |
| tree | cf3bc02250904237afcca0e4044184bca16dc24f /source/blender/editors/space_sequencer | |
| parent | 88a7d3438dc61674e4fd95698a7feffd3c9c05bb (diff) | |
Getting rid of setlinestyle: 3DView camera view.
Use new 2D dashed line shader in 3DView camera view.
Note that this also involved converting UI_draw_safe_areas() to this
dashed shader, which means it cannot be used anymore with other shaders.
Part of D2647.
Diffstat (limited to 'source/blender/editors/space_sequencer')
| -rw-r--r-- | source/blender/editors/space_sequencer/sequencer_draw.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/source/blender/editors/space_sequencer/sequencer_draw.c b/source/blender/editors/space_sequencer/sequencer_draw.c index e4fe3a6b145..8be340140bf 100644 --- a/source/blender/editors/space_sequencer/sequencer_draw.c +++ b/source/blender/editors/space_sequencer/sequencer_draw.c @@ -1044,6 +1044,7 @@ static void sequencer_draw_borders(const SpaceSeq *sseq, const View2D *v2d, cons /* safety border */ if (sseq->flag & SEQ_SHOW_SAFE_MARGINS) { +#if 0 /* Disabled just for this commit, will be fixed in next one. */ UI_draw_safe_areas( pos, x1, x2, y1, y2, scene->safe_areas.title, @@ -1055,6 +1056,7 @@ static void sequencer_draw_borders(const SpaceSeq *sseq, const View2D *v2d, cons scene->safe_areas.title_center, scene->safe_areas.action_center); } +#endif } immUnbindProgram(); |