[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [41241] branches/bmesh/blender/source: fix for errors with merge

[Campbell Barton]

Revision: 41241
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=41241
Author:   campbellbarton
Date:     2011-10-24 08:18:20 +0000 (Mon, 24 Oct 2011)
Log Message:
-----------
fix for errors with merge

Modified Paths:
--------------
    branches/bmesh/blender/source/blender/blenlib/intern/BLI_ghash.c
    branches/bmesh/blender/source/creator/creator.c

Modified: branches/bmesh/blender/source/blender/blenlib/intern/BLI_ghash.c
===================================================================
--- branches/bmesh/blender/source/blender/blenlib/intern/BLI_ghash.c	2011-10-24 07:56:42 UTC (rev 41240)
+++ branches/bmesh/blender/source/blender/blenlib/intern/BLI_ghash.c	2011-10-24 08:18:20 UTC (rev 41241)
@@ -42,8 +42,8 @@
 
 // #include "BLI_blenlib.h"
 
+#include "BLI_utildefines.h"
 #include "BLI_mempool.h"
-#include "BLI_utildefines.h"
 #include "BLI_ghash.h"
 
 #include "BLO_sys_types.h" // for intptr_t support

Modified: branches/bmesh/blender/source/creator/creator.c
===================================================================
--- branches/bmesh/blender/source/creator/creator.c	2011-10-24 07:56:42 UTC (rev 41240)
+++ branches/bmesh/blender/source/creator/creator.c	2011-10-24 08:18:20 UTC (rev 41241)
@@ -326,7 +326,7 @@
 	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);