diff options
author | Severin <eiseljulian@gmail.com> | 2018-07-02 15:50:45 +0300 |
---|---|---|
committer | Severin <eiseljulian@gmail.com> | 2018-07-02 15:50:45 +0300 |
commit | 5a17c9bcbca737525fa535ceb45f9769a34a4df7 (patch) | |
tree | c7867d25494d053d11837d04b1ab8b86526a189d /source/blender/editors/space_view3d/view3d_ruler.c | |
parent | 9887b38692e3bcf7ba613ca947fd76e299c58cbd (diff) | |
parent | 20046defd735684a42750c4cb68d20d78ad5180c (diff) |
Merge branch 'blender2.8' into temp-tab_drag_droptemp-tab_drag_drop
Diffstat (limited to 'source/blender/editors/space_view3d/view3d_ruler.c')
-rw-r--r-- | source/blender/editors/space_view3d/view3d_ruler.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/editors/space_view3d/view3d_ruler.c b/source/blender/editors/space_view3d/view3d_ruler.c index 3a86f70febb..a60baae9b11 100644 --- a/source/blender/editors/space_view3d/view3d_ruler.c +++ b/source/blender/editors/space_view3d/view3d_ruler.c @@ -470,7 +470,7 @@ static void ruler_info_draw_pixel(const struct bContext *C, ARegion *ar, void *a GPU_viewport_size_getf(viewport_size); immUniform2f("viewport_size", viewport_size[2], viewport_size[3]); - immUniform1i("num_colors", 2); /* "advanced" mode */ + immUniform1i("colors_len", 2); /* "advanced" mode */ const float *col = is_act ? color_act : color_base; immUniformArray4fv("colors", (float *)(float[][4]){{0.67f, 0.67f, 0.67f, 1.0f}, {col[0], col[1], col[2], col[3]}}, 2); immUniform1f("dash_width", 6.0f); @@ -609,7 +609,7 @@ static void ruler_info_draw_pixel(const struct bContext *C, ARegion *ar, void *a GPU_viewport_size_getf(viewport_size); immUniform2f("viewport_size", viewport_size[2], viewport_size[3]); - immUniform1i("num_colors", 2); /* "advanced" mode */ + immUniform1i("colors_len", 2); /* "advanced" mode */ const float *col = is_act ? color_act : color_base; immUniformArray4fv("colors", (float *)(float[][4]){{0.67f, 0.67f, 0.67f, 1.0f}, {col[0], col[1], col[2], col[3]}}, 2); immUniform1f("dash_width", 6.0f); |