diff options
| author | Julian Eisel <eiseljulian@gmail.com> | 2016-09-23 02:40:19 +0300 |
|---|---|---|
| committer | Julian Eisel <eiseljulian@gmail.com> | 2016-09-23 02:40:19 +0300 |
| commit | 1dfb89d229304c302b8849756aa0ddd7e8d96488 (patch) | |
| tree | db7a2ed403101788b2cb308538d73a99c95621d6 /source/gameengine | |
| parent | 4a1feaa5558ed60388fd3be41db74fbc54f2ab08 (diff) | |
| parent | 1b2b7cfa2007172e07d78324bb941d0160b59c42 (diff) | |
Merge branch 'master' into blender2.8
Conflicts:
intern/ghost/intern/GHOST_ContextCGL.mm
intern/ghost/intern/GHOST_WindowCocoa.mm
source/blender/makesrna/intern/rna_main.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 edbbf93bf7a..dd93a6ff424 100644 --- a/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp +++ b/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp @@ -1148,7 +1148,7 @@ int main( MEM_freeN(python_code); } else { - fprintf(stderr, "ERROR: cannot yield control to Python: no Python text data block named '%s'\n", python_main); + fprintf(stderr, "ERROR: cannot yield control to Python: no Python text data-block named '%s'\n", python_main); } } else { |