From 53e062da941c25050074493651e5a8c48ea13c6b Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Fri, 19 Jan 2018 17:55:51 +1100 Subject: Cleanup: sync w/ blender2.8 branch Split screen_draw.c from screen_edit.c (avoid conflicts syncing). --- source/blender/editors/screen/screen_intern.h | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'source/blender/editors/screen/screen_intern.h') diff --git a/source/blender/editors/screen/screen_intern.h b/source/blender/editors/screen/screen_intern.h index ccb6d5a6dca..db5259f5865 100644 --- a/source/blender/editors/screen/screen_intern.h +++ b/source/blender/editors/screen/screen_intern.h @@ -31,6 +31,9 @@ #ifndef __SCREEN_INTERN_H__ #define __SCREEN_INTERN_H__ +struct bContext; +struct bContextDataResult; + /* internal exports only */ #define AZONESPOT (0.6f * U.widget_unit) @@ -40,12 +43,12 @@ /* area.c */ void ED_area_data_copy(ScrArea *sa_dst, ScrArea *sa_src, const bool do_free); void ED_area_data_swap(ScrArea *sa1, ScrArea *sa2); -void region_toggle_hidden(bContext *C, ARegion *ar, const bool do_fade); +void region_toggle_hidden(struct bContext *C, ARegion *ar, const bool do_fade); /* screen_edit.c */ ScrEdge *screen_findedge(bScreen *sc, ScrVert *v1, ScrVert *v2); 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 screen_area_join(struct bContext *C, bScreen *scr, ScrArea *sa1, ScrArea *sa2); int area_getorientation(ScrArea *sa, ScrArea *sb); void select_connected_scredge(bScreen *sc, ScrEdge *edge); @@ -61,7 +64,8 @@ ScrEdge *screen_find_active_scredge(bScreen *sc, struct AZone *is_in_area_actionzone(ScrArea *sa, const int xy[2]); /* screen_context.c */ -int ed_screen_context(const bContext *C, const char *member, bContextDataResult *result); +int ed_screen_context( + const struct bContext *C, const char *member, struct bContextDataResult *result); extern const char *screen_context_dir[]; /* doc access */ -- cgit v1.2.3