Cleanup: use tabs
authorCampbell Barton <ideasman42@gmail.com>
Sat, 21 Mar 2015 05:40:17 +0000 (16:40 +1100)
committerCampbell Barton <ideasman42@gmail.com>
Sat, 21 Mar 2015 05:40:43 +0000 (16:40 +1100)
GNUmakefile
source/blender/blenkernel/intern/tracking.c
source/blender/blenlib/intern/BLI_ghash.c
source/blender/blenlib/intern/hash_mm2a.c

index 775d0ae532b5706951995af2de829ee110acd993..5a3a0b7848d1f0e0580fef5ef958f0241d1daaa4 100644 (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))" ""
index 0037002f6d8b6f37ccd96dcb8f7f93245e463c73..83db0639468d3db24e64b4cfa18cd4c331eacd9f 100644 (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
  */
index a2233c382708248672704c6d522adc6d8e4c8e25..49d3cecafed49793734fa77ab78bd6673c06c2e3 100644 (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;
-
-          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)));
-   }
+               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)));
+       }
 }
 double BLI_gset_calc_quality_ex(
         GSet *gs, double *r_load, double *r_variance,
index 87ba542e147f6a64c6334db030025eeced8c9dea..af6ef4f355fcc2430affd9e3ca3ce8b254a100da 100644 (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);