[Bf-blender-cvs] [021f8d56d0] blender2.8: OpenGL immediate mode: Fix assert when using camera.show_sensor

[Clément Foucault]

Commit: 021f8d56d070d8e3acc89c2c18cedc46ee40659d
Author: Clément Foucault
Date:   Wed Feb 15 02:56:52 2017 +0100
Branches: blender2.8
https://developer.blender.org/rB021f8d56d070d8e3acc89c2c18cedc46ee40659d

OpenGL immediate mode: Fix assert when using camera.show_sensor

===================================================================

M       source/blender/editors/space_view3d/view3d_draw.c

===================================================================

diff --git a/source/blender/editors/space_view3d/view3d_draw.c 
b/source/blender/editors/space_view3d/view3d_draw.c
index 1ecef4438c..1a5ec33d3f 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)

_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
https://lists.blender.org/mailman/listinfo/bf-blender-cvs