diff options
author | Ton Roosendaal <ton@blender.org> | 2011-01-31 20:28:03 +0300 |
---|---|---|
committer | Ton Roosendaal <ton@blender.org> | 2011-01-31 20:28:03 +0300 |
commit | 55865239a236e5567b78bf95001b0de3ab049717 (patch) | |
tree | d7dfdcecf9d1a198364c5b02b836415f25d07a44 /source/blender/editors/screen/screen_intern.h | |
parent | 31b78fd72e44de59b193295467b9b73673daccde (diff) |
Bugfix #25874
Area split error: if the first split position was exactly aligned
with another 'edge' it merged the edges, causing the subdivision
layout to go haywire. Only happens in rare occasions, good find
this report :)
Diffstat (limited to 'source/blender/editors/screen/screen_intern.h')
-rw-r--r-- | source/blender/editors/screen/screen_intern.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/editors/screen/screen_intern.h b/source/blender/editors/screen/screen_intern.h index b20daf9a0c8..87b397382a3 100644 --- a/source/blender/editors/screen/screen_intern.h +++ b/source/blender/editors/screen/screen_intern.h @@ -37,7 +37,7 @@ void area_copy_data (ScrArea *sa1, ScrArea *sa2, int swap_space); /* screen_edit.c */ ScrEdge *screen_findedge(bScreen *sc, ScrVert *v1, ScrVert *v2); -ScrArea *area_split(bScreen *sc, ScrArea *sa, char dir, float fac); +ScrArea *area_split(bScreen *sc, ScrArea *sa, char dir, float fac, int merge); int screen_area_join(bContext *C, bScreen* scr, ScrArea *sa1, ScrArea *sa2); int area_getorientation(ScrArea *sa, ScrArea *sb); void select_connected_scredge(bScreen *sc, ScrEdge *edge); |