[Bf-blender-cvs] [5452807] blender2.8: Correction to previous commit

Julian Eisel noreply at git.blender.org
Thu Dec 8 23:28:54 CET 2016


Commit: 54528079e3cfaf74eaa119615386564820b45276
Author: Julian Eisel
Date:   Thu Dec 8 23:27:56 2016 +0100
Branches: blender2.8
https://developer.blender.org/rB54528079e3cfaf74eaa119615386564820b45276

Correction to previous commit

Accidentally included some changes from workspaces branch.

===================================================================

M	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 855b838..49c0869 100644
--- a/source/blender/editors/screen/screen_intern.h
+++ b/source/blender/editors/screen/screen_intern.h
@@ -45,13 +45,6 @@ void        ED_area_data_swap(ScrArea *sa1, ScrArea *sa2);
 void        region_toggle_hidden(struct bContext *C, ARegion *ar, const bool do_fade);
 
 /* screen_edit.c */
-bScreen    *screen_add(wmWindow *win, const char *name, const int winsize_x, const int winsize_y);
-void        screen_data_copy(bScreen *to, bScreen *from);
-void        screen_new_activate_refresh(const wmWindow *win, bScreen *screen_new);
-bScreen    *screen_set_find_associated_fullscreen(const struct Main *bmain, bScreen *screen);
-void        screen_set_refresh(struct Main *bmain, struct bContext *C, wmWindow *win);
-bScreen    *screen_set_ensure_valid(const struct Main *bmain, const wmWindow *win, bScreen *screen_new);
-void        screen_set_prepare(struct bContext *C, wmWindow *win, bScreen *screen_new, bScreen *screen_old);
 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(struct bContext *C, bScreen *scr, ScrArea *sa1, ScrArea *sa2);




More information about the Bf-blender-cvs mailing list