[Bf-blender-cvs] [762405a] experimental-build: More 32bit fixes...
Bastien Montagne
noreply at git.blender.org
Wed Aug 19 23:42:52 CEST 2015
Commit: 762405ac84b255567e08752515e0e65784c1d990
Author: Bastien Montagne
Date: Wed Aug 19 23:42:30 2015 +0200
Branches: experimental-build
https://developer.blender.org/rB762405ac84b255567e08752515e0e65784c1d990
More 32bit fixes...
===================================================================
M source/blender/editors/space_file/filelist.c
===================================================================
diff --git a/source/blender/editors/space_file/filelist.c b/source/blender/editors/space_file/filelist.c
index 02b31b4..ac7eae2 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);
+ *((uint64_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. */
More information about the Bf-blender-cvs
mailing list