diff options
| author | Bastien Montagne <montagne29@wanadoo.fr> | 2016-08-10 16:06:40 +0300 |
|---|---|---|
| committer | Bastien Montagne <montagne29@wanadoo.fr> | 2016-08-10 16:06:40 +0300 |
| commit | 8fd4a8ab5db10757801a6aadc03f8248bcad73ed (patch) | |
| tree | fa78c024f3e139752d24fd2c1ad9abb9349ce3fa /source/gameengine | |
| parent | e7a32365cf9b43b97b1b1f8cd76e9834c9e4037a (diff) | |
| parent | 774beb7c3cf04cc42703a4a6ebb9a4836690b060 (diff) | |
Merge branch 'master' into blender2.8
Conflicts:
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 | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp b/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp index d033afacc08..edbbf93bf7a 100644 --- a/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp +++ b/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp @@ -61,6 +61,7 @@ extern "C" #include "DNA_scene_types.h" #include "DNA_userdef_types.h" +#include "DNA_genfile.h" #include "BLO_readfile.h" #include "BLO_runtime.h" @@ -492,6 +493,8 @@ int main( // freeing up GPU_Textures works correctly. BLI_threadapi_init(); + DNA_sdna_current_init(); + RNA_init(); init_nodesystem(); |