diff options
| author | Germano <germano.costa@ig.com.br> | 2018-01-21 23:45:47 +0300 |
|---|---|---|
| committer | Germano <germano.costa@ig.com.br> | 2018-01-21 23:45:47 +0300 |
| commit | 790025c01ed76c06e69e6054f1a718ca57771e28 (patch) | |
| tree | 7461d495f199142172b0efa34e5ad75ea65def6a /source/blender/editors/screen/screen_draw.c | |
| parent | 99efebd2dd24a8e0827cf0f13bc40c2844946676 (diff) | |
| parent | 8d671f6f6550605ac738f7a9727375a024614837 (diff) | |
Merge branch 'master' into blender2.8
# Conflicts:
# intern/cycles/blender/blender_mesh.cpp
# source/blender/editors/screen/screen_ops.c
# source/blender/editors/space_view3d/drawobject.c
Diffstat (limited to 'source/blender/editors/screen/screen_draw.c')
| -rw-r--r-- | source/blender/editors/screen/screen_draw.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/source/blender/editors/screen/screen_draw.c b/source/blender/editors/screen/screen_draw.c index 694770d088d..2e4e9127ed6 100644 --- a/source/blender/editors/screen/screen_draw.c +++ b/source/blender/editors/screen/screen_draw.c @@ -288,7 +288,7 @@ static void drawscredge_area(ScrArea *sa, int sizex, int sizey, unsigned int pos } /** - * Only for edge lines between areas, and the blended join arrows. + * Only for edge lines between areas. */ void ED_screen_draw_edges(wmWindow *win) { @@ -326,6 +326,12 @@ void ED_screen_draw_edges(wmWindow *win) screen->do_draw = false; } +/** + * The blended join arrows. + * + * \param sa1: Area from which the resultant originates. + * \param sa2: Target area that will be replaced. + */ void ED_screen_draw_join_shape(ScrArea *sa1, ScrArea *sa2) { unsigned int pos = GWN_vertformat_attr_add(immVertexFormat(), "pos", GWN_COMP_F32, 2, GWN_FETCH_FLOAT); |