projects
/
blender-staging.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
svn merge -r 30418:30512 https://svn.blender.org/svnroot/bf-blender/trunk/blender
[blender-staging.git]
/
source
/
blender
/
windowmanager
/
WM_api.h
diff --git
a/source/blender/windowmanager/WM_api.h
b/source/blender/windowmanager/WM_api.h
index 46d42b300bfe1146184002f16200509322215af7..9e303333f2c1b4e8a148f0a385b5a75283d17e13 100644
(file)
--- a/
source/blender/windowmanager/WM_api.h
+++ b/
source/blender/windowmanager/WM_api.h
@@
-57,7
+57,7
@@
void WM_init (struct bContext *C, int argc, char **argv);
void WM_exit (struct bContext *C);
void WM_main (struct bContext *C);
void WM_exit (struct bContext *C);
void WM_main (struct bContext *C);
-
void
WM_init_game (struct bContext *C);
+
int
WM_init_game (struct bContext *C);
void WM_init_splash (struct bContext *C);
void WM_init_splash (struct bContext *C);