diff options
| author | Clément Foucault <foucault.clem@gmail.com> | 2017-02-15 04:56:52 +0300 |
|---|---|---|
| committer | Clément Foucault <foucault.clem@gmail.com> | 2017-02-15 14:28:26 +0300 |
| commit | 021f8d56d070d8e3acc89c2c18cedc46ee40659d (patch) | |
| tree | 71c11c562bb82c398ba9df87f5552d68bcead244 /source/blender/editors/space_view3d/view3d_draw.c | |
| parent | 9f03718a5bdf77137c308a3c76c83254b33f7cca (diff) | |
OpenGL immediate mode: Fix assert when using camera.show_sensor
Diffstat (limited to 'source/blender/editors/space_view3d/view3d_draw.c')
| -rw-r--r-- | source/blender/editors/space_view3d/view3d_draw.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/source/blender/editors/space_view3d/view3d_draw.c b/source/blender/editors/space_view3d/view3d_draw.c index 1ecef4438c8..1a5ec33d3fc 100644 --- a/source/blender/editors/space_view3d/view3d_draw.c +++ b/source/blender/editors/space_view3d/view3d_draw.c @@ -587,9 +587,11 @@ static void drawviewborder(Scene *scene, ARegion *ar, View3D *v3d) imm_cpack(0x4040FF); imm_draw_line_box(pos, x3, y3, x4, y4); } + immUnbindProgram(); /* safety border */ if (ca) { + immBindBuiltinProgram(GPU_SHADER_2D_UNIFORM_COLOR); if (ca->dtx & CAM_DTX_CENTER) { float x3, y3; @@ -665,6 +667,7 @@ static void drawviewborder(Scene *scene, ARegion *ar, View3D *v3d) scene->safe_areas.action_center); } } + immUnbindProgram(); if (ca->flag & CAM_SHOWSENSOR) { /* determine sensor fit, and get sensor x/y, for auto fit we @@ -714,7 +717,6 @@ static void drawviewborder(Scene *scene, ARegion *ar, View3D *v3d) v3d->camera->id.name + 2, sizeof(v3d->camera->id.name) - 2); } - immUnbindProgram(); } static void drawrenderborder(ARegion *ar, View3D *v3d) |