diff options
| author | Antony Riakiotakis <kalast@gmail.com> | 2015-05-26 15:56:36 +0300 |
|---|---|---|
| committer | Antony Riakiotakis <kalast@gmail.com> | 2015-05-26 15:56:36 +0300 |
| commit | 322380999ed91179ebce511c7b14e470b48bf993 (patch) | |
| tree | c13a97f18bf388f0f4a2ad3f423764742b3f5bb9 /source/gameengine/GamePlayer | |
| parent | 650fdcd74fecc14cdfdc0b2e17317f31807b6a40 (diff) | |
| parent | a23fbc71a1886e9f83fd1d6782050d5a8c356d13 (diff) | |
Merge branch 'master' into gooseberry
Conflicts:
source/blender/editors/object/object_ops.c
Diffstat (limited to 'source/gameengine/GamePlayer')
| -rw-r--r-- | source/gameengine/GamePlayer/ghost/GPG_ghost.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp b/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp index 67ea65a5e81..6d97447dff0 100644 --- a/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp +++ b/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp @@ -74,6 +74,7 @@ extern "C" #include "BKE_report.h" #include "BKE_library.h" #include "BKE_modifier.h" +#include "BKE_material.h" #include "BKE_text.h" #include "BKE_sound.h" @@ -522,6 +523,9 @@ int main(int argc, char** argv) BKE_sound_init_once(); + // Initialize a default material for meshes without materials. + init_def_material(); + BKE_library_callback_free_window_manager_set(wm_free); /* if running blenderplayer the last argument can't be parsed since it has to be the filename. else it is bundled */ |