diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2011-10-24 12:18:20 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2011-10-24 12:18:20 +0400 |
| commit | dbe2fe5043b99f8a5717bbe5b6a9e36a6519f8c7 (patch) | |
| tree | 17a9117ca6d4b1f728196cc22e802c0a13cf9a67 /source | |
| parent | ad1d3dd30fa5f4c33279679e3824899fd18801b8 (diff) | |
fix for errors with merge
Diffstat (limited to 'source')
| -rw-r--r-- | source/blender/blenlib/intern/BLI_ghash.c | 2 | ||||
| -rw-r--r-- | source/creator/creator.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/blenlib/intern/BLI_ghash.c b/source/blender/blenlib/intern/BLI_ghash.c index 3a423135d5e..0c6ff6a7b96 100644 --- a/source/blender/blenlib/intern/BLI_ghash.c +++ b/source/blender/blenlib/intern/BLI_ghash.c @@ -42,8 +42,8 @@ // #include "BLI_blenlib.h" -#include "BLI_mempool.h" #include "BLI_utildefines.h" +#include "BLI_mempool.h" #include "BLI_ghash.h" #include "BLO_sys_types.h" // for intptr_t support diff --git a/source/creator/creator.c b/source/creator/creator.c index 7c27208d821..d62f1c6853f 100644 --- a/source/creator/creator.c +++ b/source/creator/creator.c @@ -326,7 +326,7 @@ void segmentation_handler(int UNUSED(sig)) char fname[256]; if (!G.main->name[0]) { - BLI_make_file_string("/", fname, btempdir, "crash.blend"); + BLI_make_file_string("/", fname, BLI_temporary_dir(), "crash.blend"); } else { sprintf(fname, "%s.crash.blend", G.main->name); |