diff options
author | Campbell Barton <ideasman42@gmail.com> | 2014-03-30 13:35:59 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2014-03-30 13:35:59 +0400 |
commit | 0319db10639217a17f77b9d1e16e8e28dca6022e (patch) | |
tree | 43b9bfb5da224676275b06b237c163649847bab2 /source/blender/blenlib/intern | |
parent | 905c8168348bc67664dd90e45d2b0104fb3cfc2e (diff) |
Correct own recent changes broke release builds
Diffstat (limited to 'source/blender/blenlib/intern')
-rw-r--r-- | source/blender/blenlib/intern/rand.c | 6 | ||||
-rw-r--r-- | source/blender/blenlib/intern/scanfill.c | 3 | ||||
-rw-r--r-- | source/blender/blenlib/intern/scanfill_utils.c | 2 | ||||
-rw-r--r-- | source/blender/blenlib/intern/timecode.c | 3 |
4 files changed, 7 insertions, 7 deletions
diff --git a/source/blender/blenlib/intern/rand.c b/source/blender/blenlib/intern/rand.c index 0afa4f81dba..f245fd3ca0d 100644 --- a/source/blender/blenlib/intern/rand.c +++ b/source/blender/blenlib/intern/rand.c @@ -141,9 +141,9 @@ void BLI_rng_get_float_unit_v3(RNG *rng, float v[3]) } } -void BLI_rng_shuffle_array(RNG *rng, void *data, size_t elem_size, unsigned int elem_tot) +void BLI_rng_shuffle_array(RNG *rng, void *data, unsigned int elem_size_i, unsigned int elem_tot) { - const unsigned int elem_size_i = (unsigned int)elem_size; + const size_t elem_size = (unsigned int)elem_size_i; unsigned int i = elem_tot; void *temp; @@ -211,7 +211,7 @@ float BLI_hash_frand(unsigned int seed) return BLI_rng_get_float(&rng); } -void BLI_array_randomize(void *data, size_t elem_size, unsigned int elem_tot, unsigned int seed) +void BLI_array_randomize(void *data, unsigned int elem_size, unsigned int elem_tot, unsigned int seed) { RNG rng; diff --git a/source/blender/blenlib/intern/scanfill.c b/source/blender/blenlib/intern/scanfill.c index 0610414b710..69049b51f87 100644 --- a/source/blender/blenlib/intern/scanfill.c +++ b/source/blender/blenlib/intern/scanfill.c @@ -42,10 +42,11 @@ #include "BLI_math.h" #include "BLI_memarena.h" #include "BLI_utildefines.h" -#include "BLI_strict_flags.h" #include "BLI_scanfill.h" /* own include */ +#include "BLI_strict_flags.h" + /* local types */ typedef struct PolyFill { unsigned int edges, verts; diff --git a/source/blender/blenlib/intern/scanfill_utils.c b/source/blender/blenlib/intern/scanfill_utils.c index 4bee16319f3..1ece34a0944 100644 --- a/source/blender/blenlib/intern/scanfill_utils.c +++ b/source/blender/blenlib/intern/scanfill_utils.c @@ -35,11 +35,11 @@ #include "BLI_listbase.h" #include "BLI_math.h" #include "BLI_utildefines.h" -#include "BLI_strict_flags.h" #include "BLI_ghash.h" #include "BLI_scanfill.h" /* own include */ +#include "BLI_strict_flags.h" typedef struct PolyInfo { ScanFillEdge *edge_first, *edge_last; diff --git a/source/blender/blenlib/intern/timecode.c b/source/blender/blenlib/intern/timecode.c index cd703741831..7b2ac9e112b 100644 --- a/source/blender/blenlib/intern/timecode.c +++ b/source/blender/blenlib/intern/timecode.c @@ -38,10 +38,9 @@ #include "BLI_timecode.h" /* own include */ -#include "BLI_strict_flags.h" - #include "DNA_userdef_types.h" /* for eTimecodeStyles only */ +#include "BLI_strict_flags.h" /** * Generate timecode/frame number string and store in \a str |