[Bf-blender-cvs] [c11222e] master: Fix 32bit builds... :/

[Bastien Montagne]

Commit: c11222e31a04dd9cb511d89f777da9871bf0b663
Author: Bastien Montagne
Date:   Wed Aug 19 23:54:49 2015 +0200
Branches: master
https://developer.blender.org/rBc11222e31a04dd9cb511d89f777da9871bf0b663

Fix 32bit builds... :/

===================================================================

M	source/blender/editors/space_file/filelist.c
M	source/blender/makesdna/DNA_space_types.h

===================================================================

diff --git a/source/blender/editors/space_file/filelist.c b/source/blender/editors/space_file/filelist.c
index 02b31b4..1eb2a57 100644
--- a/source/blender/editors/space_file/filelist.c
+++ b/source/blender/editors/space_file/filelist.c
@@ -2462,12 +2462,12 @@ static void filelist_readjob_do(
 			BLI_join_dirfile(dir, sizeof(dir), subdir, entry->relpath);
 			BLI_cleanup_file(root, dir);
 
-			/* Generate our entry uuid. Abusing uuid as an uint64, shall be more than enough here,
+			/* Generate our entry uuid. Abusing uuid as an uint32, shall be more than enough here,
 			 * things would crash way before we overflow that counter!
 			 * Using an atomic operation to avoid having to lock thread...
 			 * Note that we do not really need this here currently, since there is a single listing thread, but better
              * remain consistent about threading! */
-			*((uint64_t *)entry->uuid) = atomic_add_uint64((uint64_t *)filelist->filelist_intern.curr_uuid, 1);
+			*((uint32_t *)entry->uuid) = atomic_add_uint32((uint32_t *)filelist->filelist_intern.curr_uuid, 1);
 
 			BLI_path_rel(dir, root);
 			/* Only thing we change in direntry here, so we need to free it first. */
diff --git a/source/blender/makesdna/DNA_space_types.h b/source/blender/makesdna/DNA_space_types.h
index 02a36ea..b8f2ce1 100644
--- a/source/blender/makesdna/DNA_space_types.h
+++ b/source/blender/makesdna/DNA_space_types.h
@@ -773,8 +773,10 @@ typedef struct AssetUUIDList {
 typedef struct FileDirEntryRevision {
 	struct FileDirEntryRevision *next, *prev;
 
-	int uuid[4];
 	char *comment;
+	void *pad;
+
+	int uuid[4];
 
 	uint64_t size;
 	int64_t time;