blender
/
blender
134
398
Fork 580
Code Issues 6.3k Pull Requests 758 Projects 19 Wiki Activity

Cleanup: use tabs

This commit is contained in:
Campbell Barton 2015-03-21 16:40:17 +11:00
parent e0611ca832
commit 0025d90b98
4 changed files with 35 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
GNUmakefile
View File

@ -65,7 +65,7 @@ ifneq "$(findstring cycles, $(MAKECMDGOALS))" ""
BUILD_CMAKE_ARGS:=$(BUILD_CMAKE_ARGS) -C"$(BLENDER_DIR)/build_files/cmake/config/cycles_standalone.cmake"
endif
ifneq "$(findstring headless, $(MAKECMDGOALS))" ""
BUILD_DIR:=$(BUILD_DIR)_bpy
BUILD_DIR:=$(BUILD_DIR)_headless
BUILD_CMAKE_ARGS:=$(BUILD_CMAKE_ARGS) -C"$(BLENDER_DIR)/build_files/cmake/config/blender_headless.cmake"
endif
ifneq "$(findstring bpy, $(MAKECMDGOALS))" ""

2
source/blender/blenkernel/intern/tracking.c
View File

@ -547,7 +547,7 @@ bool BKE_tracking_track_has_enabled_marker_at_frame(MovieTrackingTrack *track, i
* - If action is TRACK_CLEAR_UPTO path from the beginning up to
* ref_frame-1 will be clear.
*
* - If action is TRACK_CLEAR_ALL only mareker at frame ref_frame will remain.
* - If action is TRACK_CLEAR_ALL only marker at frame ref_frame will remain.
*
* NOTE: frame number should be in clip space, not scene space
*/

64
source/blender/blenlib/intern/BLI_ghash.c
View File

@ -547,8 +547,8 @@ static void ghash_free_cb(GHash *gh, GHashKeyFreeFP keyfreefp, GHashValFreeFP va
{
unsigned int i;
BLI_assert(keyfreefp || valfreefp);
BLI_assert(!valfreefp|| !(gh->flag & GHASH_FLAG_IS_GSET));
BLI_assert(keyfreefp || valfreefp);
BLI_assert(!valfreefp || !(gh->flag & GHASH_FLAG_IS_GSET));
for (i = 0; i < gh->nbuckets; i++) {
Entry *e;
@ -1370,37 +1370,37 @@ double BLI_ghash_calc_quality_ex(
}
{
uint64_t sum = 0;
uint64_t overloaded_buckets_threshold = (uint64_t)max_ii(GHASH_LIMIT_GROW(1), 1);
uint64_t sum_overloaded = 0;
uint64_t sum_empty = 0;
uint64_t sum = 0;
uint64_t overloaded_buckets_threshold = (uint64_t)max_ii(GHASH_LIMIT_GROW(1), 1);
uint64_t sum_overloaded = 0;
uint64_t sum_empty = 0;
for (i = 0; i < gh->nbuckets; i++) {
uint64_t count = 0;
Entry *e;
for (e = gh->buckets[i]; e; e = e->next) {
count++;
}
if (r_biggest_bucket) {
*r_biggest_bucket = max_ii(*r_biggest_bucket, (int)count);
}
if (r_prop_overloaded_buckets && (count > overloaded_buckets_threshold)) {
sum_overloaded++;
}
if (r_prop_empty_buckets && !count) {
sum_empty++;
}
sum += count * (count + 1);
}
if (r_prop_overloaded_buckets) {
*r_prop_overloaded_buckets = (double)sum_overloaded / (double)gh->nbuckets;
}
if (r_prop_empty_buckets) {
*r_prop_empty_buckets = (double)sum_empty / (double)gh->nbuckets;
}
return ((double)sum * (double)gh->nbuckets /
((double)gh->nentries * (gh->nentries + 2 * gh->nbuckets - 1)));
}
for (i = 0; i < gh->nbuckets; i++) {
uint64_t count = 0;
Entry *e;
for (e = gh->buckets[i]; e; e = e->next) {
count++;
}
if (r_biggest_bucket) {
*r_biggest_bucket = max_ii(*r_biggest_bucket, (int)count);
}
if (r_prop_overloaded_buckets && (count > overloaded_buckets_threshold)) {
sum_overloaded++;
}
if (r_prop_empty_buckets && !count) {
sum_empty++;
}
sum += count * (count + 1);
}
if (r_prop_overloaded_buckets) {
*r_prop_overloaded_buckets = (double)sum_overloaded / (double)gh->nbuckets;
}
if (r_prop_empty_buckets) {
*r_prop_empty_buckets = (double)sum_empty / (double)gh->nbuckets;
}
return ((double)sum * (double)gh->nbuckets /
((double)gh->nentries * (gh->nentries + 2 * gh->nbuckets - 1)));
}
}
double BLI_gset_calc_quality_ex(
GSet *gs, double *r_load, double *r_variance,

2
source/blender/blenlib/intern/hash_mm2a.c
View File

@ -135,7 +135,7 @@ uint32_t BLI_hash_mm2(const unsigned char *data, size_t len, uint32_t seed)
case 1:
h ^= data[0];
h *= MM2A_M;
};
}
/* Do a few final mixes of the hash to ensure the last few bytes are well-incorporated. */
MM2A_MIX_FINALIZE(h);