blender
/
blender
129
398
Fork 572
Code Issues 6.2k Pull Requests 749 Projects 19 Wiki Activity

OpenGL immediate mode: Fix assert when using camera.show_sensor

This commit is contained in:
Clément Foucault 2017-02-15 02:56:52 +01:00
parent 9f03718a5b
commit 021f8d56d0
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
source/blender/editors/space_view3d/view3d_draw.c
View File

@ -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)