sandey/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

Code cleanup: warnings

Browse Source
This commit is contained in:
Campbell Barton 2014-07-20 00:38:52 +10:00
parent 21f15e2c45
commit 7e8626bbce
2 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
intern/itasc/Armature.cpp
View File

@ -15,8 +15,10 @@
namespace iTaSC { namespace iTaSC {
#if 0
// a joint constraint is characterized by 5 values: tolerance, K, alpha, yd, yddot // a joint constraint is characterized by 5 values: tolerance, K, alpha, yd, yddot
static const unsigned int constraintCacheSize = 5; static const unsigned int constraintCacheSize = 5;
#endif
std::string Armature::m_root = "root"; std::string Armature::m_root = "root";
Armature::Armature(): Armature::Armature():

16
source/blender/blenlib/intern/rand.c
View File

@ -95,15 +95,20 @@ void BLI_rng_srandom(RNG *rng, unsigned int seed)
BLI_rng_seed(rng, seed + hash[seed & 255]); BLI_rng_seed(rng, seed + hash[seed & 255]);
} }
int BLI_rng_get_int(RNG *rng) BLI_INLINE void rng_step(RNG *rng)
{ {
rng->X = (MULTIPLIER * rng->X + ADDEND) & MASK; rng->X = (MULTIPLIER * rng->X + ADDEND) & MASK;
}
int BLI_rng_get_int(RNG *rng)
{
rng_step(rng);
return (int) (rng->X >> 17); return (int) (rng->X >> 17);
} }
unsigned int BLI_rng_get_uint(RNG *rng) unsigned int BLI_rng_get_uint(RNG *rng)
{ {
rng->X = (MULTIPLIER * rng->X + ADDEND) & MASK; rng_step(rng);
return (unsigned int) (rng->X >> 17); return (unsigned int) (rng->X >> 17);
} }
@ -167,10 +172,9 @@ void BLI_rng_shuffle_array(RNG *rng, void *data, unsigned int elem_size_i, unsig
void BLI_rng_skip(RNG *rng, int n) void BLI_rng_skip(RNG *rng, int n)
{ {
int i; while (n--) {
rng_step(rng);
for (i = 0; i < n; i++) }
BLI_rng_get_int(rng);
} }
/***/ /***/