diff options
Diffstat (limited to 'source/blender/blenlib/intern')
-rw-r--r-- | source/blender/blenlib/intern/BLI_kdtree.c | 2 | ||||
-rw-r--r-- | source/blender/blenlib/intern/boxpack_2d.c | 4 | ||||
-rw-r--r-- | source/blender/blenlib/intern/jitter_2d.c | 2 | ||||
-rw-r--r-- | source/blender/blenlib/intern/listbase.c | 2 | ||||
-rw-r--r-- | source/blender/blenlib/intern/math_geom.c | 2 | ||||
-rw-r--r-- | source/blender/blenlib/intern/path_util.c | 6 | ||||
-rw-r--r-- | source/blender/blenlib/intern/string.c | 2 | ||||
-rw-r--r-- | source/blender/blenlib/intern/string_utils.c | 2 | ||||
-rw-r--r-- | source/blender/blenlib/intern/threads.c | 18 | ||||
-rw-r--r-- | source/blender/blenlib/intern/timecode.c | 4 |
10 files changed, 22 insertions, 22 deletions
diff --git a/source/blender/blenlib/intern/BLI_kdtree.c b/source/blender/blenlib/intern/BLI_kdtree.c index 844f274a81f..800e245d6bd 100644 --- a/source/blender/blenlib/intern/BLI_kdtree.c +++ b/source/blender/blenlib/intern/BLI_kdtree.c @@ -751,7 +751,7 @@ static void deduplicate_recursive(const struct DeDuplicateParams *p, uint i) * although it can still be used as a target. * \returns The numebr of merges found (includes any merges already in the \a duplicates array). * - * \note Merging is always a single step (target indices wont be marked for merging). + * \note Merging is always a single step (target indices wont be marked for merging). */ int BLI_kdtree_calc_duplicates_fast( const KDTree *tree, const float range, bool use_index_order, diff --git a/source/blender/blenlib/intern/boxpack_2d.c b/source/blender/blenlib/intern/boxpack_2d.c index cf9e29209fb..dea39631389 100644 --- a/source/blender/blenlib/intern/boxpack_2d.c +++ b/source/blender/blenlib/intern/boxpack_2d.c @@ -50,7 +50,7 @@ /* BoxPacker for backing 2D rectangles into a square - * + * * The defined Below are for internal use only */ typedef struct BoxVert { float x; @@ -271,7 +271,7 @@ static int vertex_sort(const void *p1, const void *p2, void *vs_ctx_p) * This sets boxes x,y to positive values, sorting from 0,0 outwards. * There is no limit to the space boxes may take, only that they will be packed * tightly into the lower left hand corner (0,0) - * + * * \param boxarray: a pre allocated array of boxes. * only the 'box->x' and 'box->y' are set, 'box->w' and 'box->h' are used, * 'box->index' is not used at all, the only reason its there diff --git a/source/blender/blenlib/intern/jitter_2d.c b/source/blender/blenlib/intern/jitter_2d.c index 26351f52c7f..2632e8bc234 100644 --- a/source/blender/blenlib/intern/jitter_2d.c +++ b/source/blender/blenlib/intern/jitter_2d.c @@ -4,7 +4,7 @@ * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. + * of the License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/source/blender/blenlib/intern/listbase.c b/source/blender/blenlib/intern/listbase.c index b87fed571b7..5918b4d3cf9 100644 --- a/source/blender/blenlib/intern/listbase.c +++ b/source/blender/blenlib/intern/listbase.c @@ -23,7 +23,7 @@ * Contributor(s): none yet. * * ***** END GPL LICENSE BLOCK ***** - * + * */ /** \file blender/blenlib/intern/listbase.c diff --git a/source/blender/blenlib/intern/math_geom.c b/source/blender/blenlib/intern/math_geom.c index ee6a3dcc9b3..bebb5b02584 100644 --- a/source/blender/blenlib/intern/math_geom.c +++ b/source/blender/blenlib/intern/math_geom.c @@ -767,7 +767,7 @@ float dist_squared_ray_to_aabb_v3_simple( /* Adapted from "Real-Time Collision Detection" by Christer Ericson, * published by Morgan Kaufmann Publishers, copyright 2005 Elsevier Inc. - * + * * Set 'r' to the point in triangle (a, b, c) closest to point 'p' */ void closest_on_tri_to_point_v3(float r[3], const float p[3], const float a[3], const float b[3], const float c[3]) diff --git a/source/blender/blenlib/intern/path_util.c b/source/blender/blenlib/intern/path_util.c index f19d6ca31d6..0533126fe56 100644 --- a/source/blender/blenlib/intern/path_util.c +++ b/source/blender/blenlib/intern/path_util.c @@ -1745,7 +1745,7 @@ bool BLI_path_name_at_index(const char *path, const int index, int *r_offset, in #if 0 /** * Produce image export path. - * + * * Returns: * 0 if image filename is empty or if destination path * matches image path (i.e. both are the same file). @@ -1759,12 +1759,12 @@ bool BLI_path_name_at_index(const char *path, const int index, int *r_offset, in * - if an image is "below" current .blend file directory: * rebuild the same dir structure in dest_dir * - * Example: + * Example: * src : //textures/foo/bar.png * dest: [dest_dir]/textures/foo/bar.png. * * - if an image is not "below" current .blend file directory, - * disregard it's path and copy it into the destination + * disregard it's path and copy it into the destination * directory. * * Example: diff --git a/source/blender/blenlib/intern/string.c b/source/blender/blenlib/intern/string.c index 49630347032..1b3af142b33 100644 --- a/source/blender/blenlib/intern/string.c +++ b/source/blender/blenlib/intern/string.c @@ -23,7 +23,7 @@ * Contributor(s): none yet. * * ***** END GPL LICENSE BLOCK ***** - * + * */ /** \file blender/blenlib/intern/string.c diff --git a/source/blender/blenlib/intern/string_utils.c b/source/blender/blenlib/intern/string_utils.c index a693463a302..197169ab381 100644 --- a/source/blender/blenlib/intern/string_utils.c +++ b/source/blender/blenlib/intern/string_utils.c @@ -21,7 +21,7 @@ * Contributor(s): none yet. * * ***** END GPL LICENSE BLOCK ***** - * + * */ /** \file blender/blenlib/intern/string_utils.c diff --git a/source/blender/blenlib/intern/threads.c b/source/blender/blenlib/intern/threads.c index e6f5d9839ea..dd79f3f5e5e 100644 --- a/source/blender/blenlib/intern/threads.c +++ b/source/blender/blenlib/intern/threads.c @@ -4,7 +4,7 @@ * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. + * of the License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -70,29 +70,29 @@ static void *thread_tls_data; static TaskScheduler *task_scheduler = NULL; /* ********** basic thread control API ************ - * + * * Many thread cases have an X amount of jobs, and only an Y amount of * threads are useful (typically amount of cpus) * * This code can be used to start a maximum amount of 'thread slots', which - * then can be filled in a loop with an idle timer. + * then can be filled in a loop with an idle timer. * * A sample loop can look like this (pseudo c); * * ListBase lb; * int maxthreads = 2; * int cont = 1; - * + * * BLI_threadpool_init(&lb, do_something_func, maxthreads); - * + * * while (cont) { * if (BLI_available_threads(&lb) && !(escape loop event)) { * // get new job (data pointer) - * // tag job 'processed + * // tag job 'processed * BLI_threadpool_insert(&lb, job); * } * else PIL_sleep_ms(50); - * + * * // find if a job is ready, this the do_something_func() should write in job somewhere * cont = 0; * for (go over all jobs) @@ -103,13 +103,13 @@ static TaskScheduler *task_scheduler = NULL; * } * else cont = 1; * } - * // conditions to exit loop + * // conditions to exit loop * if (if escape loop event) { * if (BLI_available_threadslots(&lb) == maxthreads) * break; * } * } - * + * * BLI_threadpool_end(&lb); * ************************************************ */ diff --git a/source/blender/blenlib/intern/timecode.c b/source/blender/blenlib/intern/timecode.c index 7856bad4d99..f59c493206f 100644 --- a/source/blender/blenlib/intern/timecode.c +++ b/source/blender/blenlib/intern/timecode.c @@ -4,7 +4,7 @@ * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. + * of the License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -18,7 +18,7 @@ * The Original Code is Copyright (C) 2008 Blender Foundation. * All rights reserved. * - * + * * Contributor(s): Joshua Leung * * ***** END GPL LICENSE BLOCK ***** |