diff options
| author | Ton Roosendaal <ton@blender.org> | 2008-12-14 20:48:52 +0300 |
|---|---|---|
| committer | Ton Roosendaal <ton@blender.org> | 2008-12-14 20:48:52 +0300 |
| commit | cc51a4f211fd239fe255b7f398829aab288f36ef (patch) | |
| tree | 188e9a72878ded3cb725d796b8882c43748db8a0 /source/blender/editors/screen/screen_intern.h | |
| parent | ec00764dd2349f723ba22b45515ec34ee81edcc3 (diff) | |
2.5
And area-joining is memory-error free again!
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 7b44b1910c7..d228748d873 100644 --- a/source/blender/editors/screen/screen_intern.h +++ b/source/blender/editors/screen/screen_intern.h @@ -38,7 +38,7 @@ void area_copy_data (ScrArea *sa1, ScrArea *sa2, int swap_space); bScreen *screen_add(struct wmWindow *win, char *name); ScrEdge *screen_findedge(bScreen *sc, ScrVert *v1, ScrVert *v2); ScrArea *area_split(wmWindow *win, bScreen *sc, ScrArea *sa, char dir, float fac); -int screen_area_join(bScreen* scr, ScrArea *sa1, ScrArea *sa2); +int screen_area_join(bContext *C, bScreen* scr, ScrArea *sa1, ScrArea *sa2); int area_getorientation(bScreen *screen, ScrArea *sa, ScrArea *sb); void select_connected_scredge(bScreen *sc, ScrEdge *edge); |