diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2017-04-27 14:41:57 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2017-04-27 14:42:08 +0300 |
| commit | 98b6c6f2c0227b9a6d9db8bd47ee6cad27f35b4b (patch) | |
| tree | 0e13eee0ea3845dcafa0440323635f3ae38a7a5e /source/blender/editors/space_view3d/view3d_intern.h | |
| parent | 21d31f8f58ff1454b663faac0d1260f7c5168a65 (diff) | |
| parent | bdf8ad6c4e521884a544f6dbfa244c27720cd4bb (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/editors/space_view3d/view3d_intern.h')
| -rw-r--r-- | source/blender/editors/space_view3d/view3d_intern.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/editors/space_view3d/view3d_intern.h b/source/blender/editors/space_view3d/view3d_intern.h index 51293f41fa5..dd9570eb656 100644 --- a/source/blender/editors/space_view3d/view3d_intern.h +++ b/source/blender/editors/space_view3d/view3d_intern.h @@ -168,7 +168,7 @@ void view3d_cached_text_draw_begin(void); void view3d_cached_text_draw_add(const float co[3], const char *str, const size_t str_len, short xoffs, short flag, const unsigned char col[4]); -void view3d_cached_text_draw_end(View3D *v3d, ARegion *ar, bool depth_write, float mat[4][4]); +void view3d_cached_text_draw_end(View3D *v3d, ARegion *ar, bool depth_write); bool check_object_draw_texture(struct Scene *scene, struct View3D *v3d, const char drawtype); |