diff options
author | Lukas Tönne <lukas.toenne@gmail.com> | 2016-04-28 18:33:19 +0300 |
---|---|---|
committer | Lukas Tönne <lukas.toenne@gmail.com> | 2016-04-28 18:33:19 +0300 |
commit | 1f723603c882e6d79ab69bea6e5c034ae21a6ce7 (patch) | |
tree | 098b0133beea06c460c3e9e92010bc669d151e5d /source/creator/creator.c | |
parent | 3632c4997f5019d2a519996d9e216d474aa05d3b (diff) | |
parent | a48d7407986d04492107a2ef16d0ff6f0d012c45 (diff) |
Merge branch 'master' into temp_remove_particlestemp_remove_particles
Diffstat (limited to 'source/creator/creator.c')
-rw-r--r-- | source/creator/creator.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/creator/creator.c b/source/creator/creator.c index 98e3a5c881c..d253cbad177 100644 --- a/source/creator/creator.c +++ b/source/creator/creator.c @@ -317,7 +317,7 @@ int main( BLI_threadapi_init(); - initglobals(); /* blender.c */ + BKE_blender_globals_init(); /* blender.c */ IMB_init(); BKE_images_init(); |