diff options
| author | Bastien Montagne <montagne29@wanadoo.fr> | 2016-07-25 16:07:17 +0300 |
|---|---|---|
| committer | Bastien Montagne <montagne29@wanadoo.fr> | 2016-07-25 16:07:17 +0300 |
| commit | b1532493c27b08444745cef348641f3a0e899ba8 (patch) | |
| tree | 84db57081ef3e1d2a1bfbf3c4bbfe352854164f2 /source/gameengine | |
| parent | 9186b9ae4806f4bbc1a14417c408e844f8e8cc1a (diff) | |
| parent | e7721f5ec8b859d14c982a8a34bc269ab7eed82b (diff) | |
Merge branch 'master' into blender2.8
Conflicts:
source/blender/blenkernel/BKE_particle.h
source/blender/blenkernel/intern/library.c
source/blender/blenkernel/intern/particle.c
Diffstat (limited to 'source/gameengine')
| -rw-r--r-- | source/gameengine/GamePlayer/ghost/GPG_ghost.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp b/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp index 9c3f94f1918..d033afacc08 100644 --- a/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp +++ b/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp @@ -709,7 +709,7 @@ int main( { i++; if ( (i + 1) <= validArguments ) - parentWindow = atoi(argv[i++]); + parentWindow = (GHOST_TEmbedderWindowID)atoll(argv[i++]); else { error = true; printf("error: too few options for parent window argument.\n"); |