diff options
| author | Luca Rood <dev@lucarood.com> | 2017-02-03 04:17:22 +0300 |
|---|---|---|
| committer | Luca Rood <dev@lucarood.com> | 2017-02-03 04:21:08 +0300 |
| commit | b1b5ded37f9e2967fb1e2b33c6aef89c233750ed (patch) | |
| tree | 5e2548a10474fa294981fbdb80b1e2fe0b1b3d02 /source/blender/editors | |
| parent | d85295534b6dad80b9c0db32708f7318ef79e134 (diff) | |
Fix shaders in some immBindBuiltinProgram calls
Had mistakenly used 3D shaders for some 2D drawings...
Replaced those now.
Part of T49043
Diffstat (limited to 'source/blender/editors')
| -rw-r--r-- | source/blender/editors/space_graph/space_graph.c | 2 | ||||
| -rw-r--r-- | source/blender/editors/space_view3d/view3d_ruler.c | 6 | ||||
| -rw-r--r-- | source/blender/editors/transform/transform_snap.c | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/source/blender/editors/space_graph/space_graph.c b/source/blender/editors/space_graph/space_graph.c index 3a9a4b18842..70d3fad9554 100644 --- a/source/blender/editors/space_graph/space_graph.c +++ b/source/blender/editors/space_graph/space_graph.c @@ -269,7 +269,7 @@ static void graph_main_region_draw(const bContext *C, ARegion *ar) if (((sipo->flag & SIPO_NODRAWCURSOR) == 0) || (sipo->mode == SIPO_MODE_DRIVERS)) { unsigned pos = add_attrib(immVertexFormat(), "pos", GL_FLOAT, 2, KEEP_FLOAT); - immBindBuiltinProgram(GPU_SHADER_3D_UNIFORM_COLOR); + immBindBuiltinProgram(GPU_SHADER_2D_UNIFORM_COLOR); /* horizontal component of value-cursor (value line before the current frame line) */ if ((sipo->flag & SIPO_NODRAWCURSOR) == 0) { diff --git a/source/blender/editors/space_view3d/view3d_ruler.c b/source/blender/editors/space_view3d/view3d_ruler.c index dde3ef75a86..482fe356b46 100644 --- a/source/blender/editors/space_view3d/view3d_ruler.c +++ b/source/blender/editors/space_view3d/view3d_ruler.c @@ -461,7 +461,7 @@ static void ruler_info_draw_pixel(const struct bContext *C, ARegion *ar, void *a if (ruler_item->flag & RULERITEM_USE_ANGLE) { unsigned pos = add_attrib(immVertexFormat(), "pos", GL_FLOAT, 2, KEEP_FLOAT); - immBindBuiltinProgram(GPU_SHADER_3D_UNIFORM_COLOR); + immBindBuiltinProgram(GPU_SHADER_2D_UNIFORM_COLOR); imm_cpack(is_act ? color_act : color_base); immBegin(GL_LINE_STRIP, 3); @@ -603,7 +603,7 @@ static void ruler_info_draw_pixel(const struct bContext *C, ARegion *ar, void *a else { unsigned pos = add_attrib(immVertexFormat(), "pos", GL_FLOAT, 2, KEEP_FLOAT); - immBindBuiltinProgram(GPU_SHADER_3D_UNIFORM_COLOR); + immBindBuiltinProgram(GPU_SHADER_2D_UNIFORM_COLOR); imm_cpack(is_act ? color_act : color_base); immBegin(GL_LINE_STRIP, 2); @@ -706,7 +706,7 @@ static void ruler_info_draw_pixel(const struct bContext *C, ARegion *ar, void *a unsigned pos = add_attrib(immVertexFormat(), "pos", GL_FLOAT, 2, KEEP_FLOAT); - immBindBuiltinProgram(GPU_SHADER_3D_UNIFORM_COLOR); + immBindBuiltinProgram(GPU_SHADER_2D_UNIFORM_COLOR); imm_cpack(color_act); imm_draw_lined_circle(pos, co_ss[0], co_ss[1], size * U.pixelsize, 32); diff --git a/source/blender/editors/transform/transform_snap.c b/source/blender/editors/transform/transform_snap.c index 6ca963bc0e3..81f7af5a2ce 100644 --- a/source/blender/editors/transform/transform_snap.c +++ b/source/blender/editors/transform/transform_snap.c @@ -249,7 +249,7 @@ void drawSnapping(const struct bContext *C, TransInfo *t) unsigned pos = add_attrib(immVertexFormat(), "pos", GL_FLOAT, 2, KEEP_FLOAT); - immBindBuiltinProgram(GPU_SHADER_3D_UNIFORM_COLOR); + immBindBuiltinProgram(GPU_SHADER_2D_UNIFORM_COLOR); for (p = t->tsnap.points.first; p; p = p->next) { if (p == t->tsnap.selectedPoint) { |