diff options
Diffstat (limited to 'source/blender/blenlib')
21 files changed, 110 insertions, 192 deletions
diff --git a/source/blender/blenlib/BLI_dlrbTree.h b/source/blender/blenlib/BLI_dlrbTree.h index 9cb5686131e..e8765e699c8 100644 --- a/source/blender/blenlib/BLI_dlrbTree.h +++ b/source/blender/blenlib/BLI_dlrbTree.h @@ -97,7 +97,7 @@ typedef void (*DLRBT_NUpdate_FP)(void *node, void *data); /* ADT Management ------------------------------- */ -/* Create a new tree, and initialise as necessary */ +/* Create a new tree, and initialize as necessary */ DLRBT_Tree *BLI_dlrbTree_new(void); /* Initialises some given trees */ diff --git a/source/blender/blenlib/BLI_dynstr.h b/source/blender/blenlib/BLI_dynstr.h index 6b499c3bbcf..e6a2bb45a68 100644 --- a/source/blender/blenlib/BLI_dynstr.h +++ b/source/blender/blenlib/BLI_dynstr.h @@ -48,32 +48,32 @@ typedef struct DynStr DynStr; /** * Create a new DynStr. * - * @return Pointer to a new DynStr. + * \return Pointer to a new DynStr. */ DynStr* BLI_dynstr_new (void); /** * Append a c-string to a DynStr. * - * @param ds The DynStr to append to. - * @param cstr The c-string to append. + * \param ds The DynStr to append to. + * \param cstr The c-string to append. */ void BLI_dynstr_append (DynStr *ds, const char *cstr); /** * Append a length clamped c-string to a DynStr. * - * @param ds The DynStr to append to. - * @param cstr The c-string to append. - * @param len The maximum length of the c-string to copy. + * \param ds The DynStr to append to. + * \param cstr The c-string to append. + * \param len The maximum length of the c-string to copy. */ void BLI_dynstr_nappend (DynStr *ds, const char *cstr, int len); /** * Append a c-string to a DynStr, but with formatting like printf. * - * @param ds The DynStr to append to. - * @param format The printf format string to use. + * \param ds The DynStr to append to. + * \param format The printf format string to use. */ void BLI_dynstr_appendf (DynStr *ds, const char *format, ...) #ifdef __GNUC__ @@ -85,8 +85,8 @@ void BLI_dynstr_vappendf (DynStr *ds, const char *format, va_list args); /** * Find the length of a DynStr. * - * @param ds The DynStr of interest. - * @return The length of @a ds. + * \param ds The DynStr of interest. + * \return The length of \a ds. */ int BLI_dynstr_get_len (DynStr *ds); @@ -95,8 +95,8 @@ int BLI_dynstr_get_len (DynStr *ds); * <i> The returned c-string should be free'd * using MEM_freeN. </i> * - * @param ds The DynStr of interest. - * @return The contents of @a ds as a c-string. + * \param ds The DynStr of interest. + * \return The contents of \a ds as a c-string. */ char* BLI_dynstr_get_cstring (DynStr *ds); @@ -105,16 +105,16 @@ char* BLI_dynstr_get_cstring (DynStr *ds); * <i> The str argument must be allocated to be at * least the size of BLI_dynstr_get_len(ds) + 1. </i> * - * @param ds The DynStr of interest. - * @param str The string to fill. - * @return The contents of @a ds as a c-string. + * \param ds The DynStr of interest. + * \param str The string to fill. + * \return The contents of \a ds as a c-string. */ void BLI_dynstr_get_cstring_ex (DynStr *ds, char *str); /** * Free the DynStr * - * @param ds The DynStr to free. + * \param ds The DynStr to free. */ void BLI_dynstr_free (DynStr *ds); diff --git a/source/blender/blenlib/BLI_ghash.h b/source/blender/blenlib/BLI_ghash.h index ccad3250a5f..457f098bff7 100644 --- a/source/blender/blenlib/BLI_ghash.h +++ b/source/blender/blenlib/BLI_ghash.h @@ -80,8 +80,8 @@ int BLI_ghash_size (GHash *gh); * while the iterator is in use, and the iterator will step exactly * BLI_ghash_size(gh) times before becoming done. * - * @param gh The GHash to iterate over. - * @return Pointer to a new DynStr. + * \param gh The GHash to iterate over. + * \return Pointer to a new DynStr. */ GHashIterator* BLI_ghashIterator_new (GHash *gh); /** @@ -89,45 +89,45 @@ GHashIterator* BLI_ghashIterator_new (GHash *gh); * be mutated while the iterator is in use, and the iterator will * step exactly BLI_ghash_size(gh) times before becoming done. * - * @param ghi The GHashIterator to initialize. - * @param gh The GHash to iterate over. + * \param ghi The GHashIterator to initialize. + * \param gh The GHash to iterate over. */ void BLI_ghashIterator_init(GHashIterator *ghi, GHash *gh); /** * Free a GHashIterator. * - * @param ghi The iterator to free. + * \param ghi The iterator to free. */ void BLI_ghashIterator_free (GHashIterator *ghi); /** * Retrieve the key from an iterator. * - * @param ghi The iterator. - * @return The key at the current index, or NULL if the + * \param ghi The iterator. + * \return The key at the current index, or NULL if the * iterator is done. */ void* BLI_ghashIterator_getKey (GHashIterator *ghi); /** * Retrieve the value from an iterator. * - * @param ghi The iterator. - * @return The value at the current index, or NULL if the + * \param ghi The iterator. + * \return The value at the current index, or NULL if the * iterator is done. */ void* BLI_ghashIterator_getValue (GHashIterator *ghi); /** * Steps the iterator to the next index. * - * @param ghi The iterator. + * \param ghi The iterator. */ void BLI_ghashIterator_step (GHashIterator *ghi); /** * Determine if an iterator is done (has reached the end of * the hash table). * - * @param ghi The iterator. - * @return True if done, False otherwise. + * \param ghi The iterator. + * \return True if done, False otherwise. */ int BLI_ghashIterator_isDone (GHashIterator *ghi); diff --git a/source/blender/blenlib/BLI_graph.h b/source/blender/blenlib/BLI_graph.h index effa2c3bc03..52613f9869f 100644 --- a/source/blender/blenlib/BLI_graph.h +++ b/source/blender/blenlib/BLI_graph.h @@ -177,7 +177,7 @@ void BLI_mirrorAlongAxis(float v[3], float center[3], float axis[3]); /* BArc symmetry flags * - * axial symetry sides */ + * axial symmetry sides */ #define SYM_SIDE_POSITIVE 1 #define SYM_SIDE_NEGATIVE 2 /* Anything higher is the order in radial symmetry */ diff --git a/source/blender/blenlib/BLI_gsqueue.h b/source/blender/blenlib/BLI_gsqueue.h index 53fdb5a541a..0265cf9b639 100644 --- a/source/blender/blenlib/BLI_gsqueue.h +++ b/source/blender/blenlib/BLI_gsqueue.h @@ -39,8 +39,8 @@ typedef struct _GSQueue GSQueue; /** * Create a new GSQueue. * - * @param elem_size The size of the structures in the queue. - * @retval The new queue + * \param elem_size The size of the structures in the queue. + * \retval The new queue */ GSQueue* BLI_gsqueue_new (int elem_size); @@ -58,7 +58,7 @@ int BLI_gsqueue_size(GSQueue *gq); * Access the item at the head of the queue * without removing it. * - * @param item_r A pointer to an appropriatly + * \param item_r A pointer to an appropriatly * sized structure (the size passed to BLI_gsqueue_new) */ void BLI_gsqueue_peek (GSQueue *gq, void *item_r); @@ -67,7 +67,7 @@ void BLI_gsqueue_peek (GSQueue *gq, void *item_r); * Access the item at the head of the queue * and remove it. * - * @param item_r A pointer to an appropriatly + * \param item_r A pointer to an appropriatly * sized structure (the size passed to BLI_gsqueue_new). * Can be NULL if desired. */ @@ -76,7 +76,7 @@ void BLI_gsqueue_pop (GSQueue *gq, void *item_r); /** * Push an element onto the tail of the queue. * - * @param item A pointer to an appropriatly + * \param item A pointer to an appropriatly * sized structure (the size passed to BLI_gsqueue_new). */ void BLI_gsqueue_push (GSQueue *gq, void *item); @@ -85,7 +85,7 @@ void BLI_gsqueue_push (GSQueue *gq, void *item); * Push an element back onto the head of the queue (so * it would be returned from the next call to BLI_gsqueue_pop). * - * @param item A pointer to an appropriatly + * \param item A pointer to an appropriatly * sized structure (the size passed to BLI_gsqueue_new). */ void BLI_gsqueue_pushback (GSQueue *gq, void *item); diff --git a/source/blender/blenlib/BLI_math_geom.h b/source/blender/blenlib/BLI_math_geom.h index b46f79fb2e6..2a5543b10ed 100644 --- a/source/blender/blenlib/BLI_math_geom.h +++ b/source/blender/blenlib/BLI_math_geom.h @@ -111,12 +111,12 @@ int isect_ray_plane_v3(const float p1[3], const float d[3], /** * Intersect line/plane, optionally treat line as directional (like a ray) with the no_flip argument. - * @param out The intersection point. - * @param l1 The first point of the line. - * @param l2 The second point of the line. - * @param plane_co A point on the plane to intersect with. - * @param plane_no The direction of the plane (does not need to be normalized). - * @param no_flip When true, the intersection point will always be from l1 to l2, even if this is not on the plane. + * \param out The intersection point. + * \param l1 The first point of the line. + * \param l2 The second point of the line. + * \param plane_co A point on the plane to intersect with. + * \param plane_no The direction of the plane (does not need to be normalized). + * \param no_flip When true, the intersection point will always be from l1 to l2, even if this is not on the plane. */ int isect_line_plane_v3(float out[3], const float l1[3], const float l2[3], const float plane_co[3], const float plane_no[3], const short no_flip); @@ -125,12 +125,12 @@ int isect_line_plane_v3(float out[3], const float l1[3], const float l2[3], * Intersect two planes, return a point on the intersection and a vector * that runs on the direction of the intersection. * Return error code is the same as 'isect_line_line_v3'. - * @param r_isect_co The resulting intersection point. - * @param r_isect_no The resulting vector of the intersection. - * @param plane_a_co The point on the first plane. - * @param plane_a_no The normal of the first plane. - * @param plane_b_co The point on the second plane. - * @param plane_b_no The normal of the second plane. + * \param r_isect_co The resulting intersection point. + * \param r_isect_no The resulting vector of the intersection. + * \param plane_a_co The point on the first plane. + * \param plane_a_no The normal of the first plane. + * \param plane_b_co The point on the second plane. + * \param plane_b_no The normal of the second plane. */ void isect_plane_plane_v3(float r_isect_co[3], float r_isect_no[3], const float plane_a_co[3], const float plane_a_no[3], diff --git a/source/blender/blenlib/BLI_path_util.h b/source/blender/blenlib/BLI_path_util.h index a2d432b492a..3ee548098ff 100644 --- a/source/blender/blenlib/BLI_path_util.h +++ b/source/blender/blenlib/BLI_path_util.h @@ -131,15 +131,15 @@ int BLI_has_parent(char *path); /** * Blender's path code replacement function. - * Bases @a path strings leading with "//" by the - * directory @a basepath, and replaces instances of - * '#' with the @a framenum. Results are written - * back into @a path. + * Bases \a path strings leading with "//" by the + * directory \a basepath, and replaces instances of + * '#' with the \a framenum. Results are written + * back into \a path. * - * @a path The path to convert - * @a basepath The directory to base relative paths with. - * @a framenum The framenumber to replace the frame code with. - * @retval Returns true if the path was relative (started with "//"). + * \a path The path to convert + * \a basepath The directory to base relative paths with. + * \a framenum The framenumber to replace the frame code with. + * \retval Returns true if the path was relative (started with "//"). */ int BLI_path_abs(char *path, const char *basepath); int BLI_path_frame(char *path, int frame, int digits); @@ -156,12 +156,12 @@ void BLI_path_rel(char *file, const char *relfile); #endif /** - * Change every @a from in @a string into @a to. The - * result will be in @a string + * Change every \a from in \a string into \a to. The + * result will be in \a string * - * @a string The string to work on - * @a from The character to replace - * @a to The character to replace with + * \a string The string to work on + * \a from The character to replace + * \a to The character to replace with */ void BLI_char_switch(char *string, char from, char to); diff --git a/source/blender/blenlib/BLI_rand.h b/source/blender/blenlib/BLI_rand.h index 1749bbcc38a..d4d6563ac99 100644 --- a/source/blender/blenlib/BLI_rand.h +++ b/source/blender/blenlib/BLI_rand.h @@ -68,8 +68,8 @@ double BLI_drand (void); /** Return a pseudo-random number N where 0.0f<=N<1.0f */ float BLI_frand (void); - /** Fills a block of memory starting at @a addr - * and extending @a len bytes with pseudo-random + /** Fills a block of memory starting at \a addr + * and extending \a len bytes with pseudo-random * contents. This routine does not use nor modify * the state of the BLI random number generator. */ diff --git a/source/blender/blenlib/BLI_rect.h b/source/blender/blenlib/BLI_rect.h index 4ff203737a0..d1209524c15 100644 --- a/source/blender/blenlib/BLI_rect.h +++ b/source/blender/blenlib/BLI_rect.h @@ -46,7 +46,7 @@ extern "C" { * rect is one with a zero (or negative) * width or height. * - * @return True if @a rect is empty. + * \return True if \a rect is empty. */ int BLI_rcti_is_empty(struct rcti *rect); int BLI_rctf_is_empty(struct rctf *rect); diff --git a/source/blender/blenlib/BLI_scanfill.h b/source/blender/blenlib/BLI_scanfill.h index 1f0e455fa45..d497ffa4941 100644 --- a/source/blender/blenlib/BLI_scanfill.h +++ b/source/blender/blenlib/BLI_scanfill.h @@ -36,7 +36,7 @@ */ /** - * @attention Defined in scanfill.c + * \attention Defined in scanfill.c */ extern struct ListBase fillvertbase; extern struct ListBase filledgebase; @@ -94,8 +94,8 @@ void BLI_end_edgefill(void); /** * Set a function taking a char* as argument to flag errors. If the * callback is not set, the error is discarded. - * @param f The function to use as callback - * @attention used in creator.c + * \param f The function to use as callback + * \attention used in creator.c */ void BLI_setErrorCallBack(void (*f)(const char*)); @@ -104,8 +104,8 @@ void BLI_setErrorCallBack(void (*f)(const char*)); * in this module. If the function returns true, the execution will * terminate gracefully. If the callback is not set, interruption is * not possible. - * @param f The function to use as callback - * @attention used in creator.c + * \param f The function to use as callback + * \attention used in creator.c */ void BLI_setInterruptCallBack(int (*f)(void)); diff --git a/source/blender/blenlib/BLI_sparsemap.h b/source/blender/blenlib/BLI_sparsemap.h deleted file mode 100644 index 654cafbc200..00000000000 --- a/source/blender/blenlib/BLI_sparsemap.h +++ /dev/null @@ -1,81 +0,0 @@ -#if 0 -/* - * ***** BEGIN GPL LICENSE BLOCK ***** - * - * 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. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software Foundation, - * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - * - * The Original Code is Copyright (C) 2009 Blender Foundation, Joshua Leung - * All rights reserved. - * - * Contributor(s): Joseph Eagar (original author) - * - * ***** END GPL LICENSE BLOCK ***** - */ - -#ifndef __BLI_SPARSEMAP_H__ -#define __BLI_SPARSEMAP_H__ - -/** \file BLI_sparsemap.h - * \ingroup bli - */ - -#include "BLI_math_inline.h" - -typedef struct SparseMap { - int max; - int blocksize; - void **blocks; - int totblock; -} SparseMap; - -MALWAYS_INLINE SparseMap *BLI_sparsemap_new(int blocksize, char *name) -{ - SparseMap *sm = MEM_callocN(sizeof(SparseMap), name); - - sm->blocksize = blocksize; - return sm; -} - -MALWAYS_INLINE void BLI_sparsemap_free(SparseMap *sm) -{ - if (sm->blocks) - MEM_freeN(sm->blocks); - - MEM_freeN(sm); -} - -MALWAYS_INLINE void BLI_sparsemap_set(SparseMap *sm, int index, void *ptr) -{ - if (index >= sm->max || (sm->blocks && !sm->blocks[index/sm->blocksize])) { - int totblock = MAX2((index+1)/sm->blocksize, 2); - void *blocks = MEM_callocN(sizeof(void*)*totblock); - - if (sm->blocks) - memcpy(blocks, sm->blocks, sizeof(void*)*sm->totblock); - sm->totblock = totblock; - MEM_freeN(sm->blocks); - sm->blocks = blocks; - } - - if (!sm->blocks[index/sm->blocksize]) { - sm->blocks[index/sm->blocksize] = MEM_mallocN(sizeof(void*)*sm->blocksize); - } - - sm->blocks[index/sm->blocksize] = ptr; -} - -#endif /* __BLI_SPARSEMAP_H__ */ - -#endif diff --git a/source/blender/blenlib/BLI_string.h b/source/blender/blenlib/BLI_string.h index 0f419920b21..ec36d587d92 100644 --- a/source/blender/blenlib/BLI_string.h +++ b/source/blender/blenlib/BLI_string.h @@ -37,30 +37,30 @@ extern "C" { #endif /** - * Duplicates the cstring @a str into a newly mallocN'd + * Duplicates the cstring \a str into a newly mallocN'd * string and returns it. * - * @param str The string to be duplicated - * @retval Returns the duplicated string + * \param str The string to be duplicated + * \retval Returns the duplicated string */ char *BLI_strdup(const char *str); /** - * Duplicates the first @a len bytes of cstring @a str - * into a newly mallocN'd string and returns it. @a str + * Duplicates the first \a len bytes of cstring \a str + * into a newly mallocN'd string and returns it. \a str * is assumed to be at least len bytes long. * - * @param str The string to be duplicated - * @param len The number of bytes to duplicate - * @retval Returns the duplicated string + * \param str The string to be duplicated + * \param len The number of bytes to duplicate + * \retval Returns the duplicated string */ char *BLI_strdupn(const char *str, const size_t len); /** * Appends the two strings, and returns new mallocN'ed string - * @param str1 first string for copy - * @param str2 second string for append - * @retval Returns dst + * \param str1 first string for copy + * \param str2 second string for append + * \retval Returns dst */ char *BLI_strdupcat(const char *str1, const char *str2); @@ -68,11 +68,11 @@ char *BLI_strdupcat(const char *str1, const char *str2); * Like strncpy but ensures dst is always * '\0' terminated. * - * @param dst Destination for copy - * @param src Source string to copy - * @param maxncpy Maximum number of characters to copy (generally + * \param dst Destination for copy + * \param src Source string to copy + * \param maxncpy Maximum number of characters to copy (generally * the size of dst) - * @retval Returns dst + * \retval Returns dst */ char *BLI_strncpy(char *dst, const char *src, const size_t maxncpy); @@ -88,14 +88,14 @@ char *BLI_strncpy(char *dst, const char *src, const size_t maxncpy); char *BLI_getQuotedStr(const char *str, const char *prefix); /** - * Returns a copy of the cstring @a str into a newly mallocN'd + * Returns a copy of the cstring \a str into a newly mallocN'd * string with all instances of oldText replaced with newText, * and returns it. * - * @param str The string to replace occurrences of oldText in - * @param oldText The text in the string to find and replace - * @param newText The text in the string to find and replace - * @retval Returns the duplicated string + * \param str The string to replace occurrences of oldText in + * \param oldText The text in the string to find and replace + * \param newText The text in the string to find and replace + * \retval Returns the duplicated string */ char *BLI_replacestr(char *str, const char *oldText, const char *newText); @@ -123,7 +123,7 @@ size_t BLI_strescape(char *dst, const char *src, const size_t maxlen); /** * Compare two strings without regard to case. * - * @retval True if the strings are equal, false otherwise. + * \retval True if the strings are equal, false otherwise. */ int BLI_strcaseeq(const char *a, const char *b); diff --git a/source/blender/blenlib/BLI_vfontdata.h b/source/blender/blenlib/BLI_vfontdata.h index 5f7b7c39036..0020ba308af 100644 --- a/source/blender/blenlib/BLI_vfontdata.h +++ b/source/blender/blenlib/BLI_vfontdata.h @@ -70,8 +70,8 @@ struct TmpFont * Construct a new VFontData structure from * Freetype font data in a PackedFile. * - * @param pf The font data. - * @retval A new VFontData structure, or NULL + * \param pf The font data. + * \retval A new VFontData structure, or NULL * if unable to load. */ VFontData* diff --git a/source/blender/blenlib/CMakeLists.txt b/source/blender/blenlib/CMakeLists.txt index 46538a6e0c1..90fd8d15c35 100644 --- a/source/blender/blenlib/CMakeLists.txt +++ b/source/blender/blenlib/CMakeLists.txt @@ -92,7 +92,6 @@ set(SRC BLI_array.h BLI_bitmap.h BLI_smallhash.h - BLI_sparsemap.h BLI_args.h BLI_blenlib.h BLI_boxpack2d.h diff --git a/source/blender/blenlib/PIL_time.h b/source/blender/blenlib/PIL_time.h index cef7ba436bc..7d34d33d686 100644 --- a/source/blender/blenlib/PIL_time.h +++ b/source/blender/blenlib/PIL_time.h @@ -42,14 +42,14 @@ extern "C" { extern /** Return an indication of time, expressed as * seconds since some fixed point. Successive calls - * are guarenteed to generate values greater than or + * are guaranteed to generate values greater than or * equal to the last call. */ double PIL_check_seconds_timer (void); /** * Platform-independent sleep function. - * @param ms Number of milliseconds to sleep + * \param ms Number of milliseconds to sleep */ void PIL_sleep_ms (int ms); diff --git a/source/blender/blenlib/intern/BLI_kdopbvh.c b/source/blender/blenlib/intern/BLI_kdopbvh.c index 9ce58aba5b8..afc8a6a4aa6 100644 --- a/source/blender/blenlib/intern/BLI_kdopbvh.c +++ b/source/blender/blenlib/intern/BLI_kdopbvh.c @@ -656,7 +656,7 @@ static int implicit_leafs_index(BVHBuildHelper *data, int depth, int child_index * Its possible to find the position of the child or the parent with simple maths (multiplication and adittion). This type * of tree is for example used on heaps.. where node N has its childs at indexs N*2 and N*2+1. * - * Altought in this case the tree type is general.. and not know until runtime. + * Although in this case the tree type is general.. and not know until runtime. * tree_type stands for the maximum number of childs that a tree node can have. * All tree types >= 2 are supported. * @@ -721,7 +721,7 @@ static void split_leafs(BVHNode **leafs_array, int *nth, int partitions, int spl * to use multithread building. * * To archieve this is necessary to find how much leafs are accessible from a certain branch, BVHBuildHelper - * implicit_needed_branches and implicit_leafs_index are auxiliar functions to solve that "optimal-split". + * implicit_needed_branches and implicit_leafs_index are auxiliary functions to solve that "optimal-split". */ static void non_recursive_bvh_div_nodes(BVHTree *tree, BVHNode *branches_array, BVHNode **leafs_array, int num_leafs) { diff --git a/source/blender/blenlib/intern/DLRB_tree.c b/source/blender/blenlib/intern/DLRB_tree.c index b7df06bbf24..0e90042a35f 100644 --- a/source/blender/blenlib/intern/DLRB_tree.c +++ b/source/blender/blenlib/intern/DLRB_tree.c @@ -36,7 +36,7 @@ /* *********************************************** */ /* Tree API */ -/* Create a new tree, and initialise as necessary */ +/* Create a new tree, and initialize as necessary */ DLRBT_Tree *BLI_dlrbTree_new (void) { /* just allocate for now */ diff --git a/source/blender/blenlib/intern/fileops.c b/source/blender/blenlib/intern/fileops.c index ad0478060f2..895ae03ab0f 100644 --- a/source/blender/blenlib/intern/fileops.c +++ b/source/blender/blenlib/intern/fileops.c @@ -323,7 +323,7 @@ int BLI_rename(const char *from, const char *to) /* * but the UNIX world is tied to the interface, and the system * timer, and... We implement a callback mechanism. The system will - * have to initialise the callback before the functions will work! + * have to initialize the callback before the functions will work! * */ static char str[12 + (MAXPATHLEN * 2)]; diff --git a/source/blender/blenlib/intern/math_matrix.c b/source/blender/blenlib/intern/math_matrix.c index f1dc65bd066..e07025ccf56 100644 --- a/source/blender/blenlib/intern/math_matrix.c +++ b/source/blender/blenlib/intern/math_matrix.c @@ -1196,7 +1196,7 @@ void loc_eul_size_to_mat4(float mat[4][4], const float loc[3], const float eul[3 { float rmat[3][3], smat[3][3], tmat[3][3]; - /* initialise new matrix */ + /* initialize new matrix */ unit_m4(mat); /* make rotation + scaling part */ @@ -1219,7 +1219,7 @@ void loc_eulO_size_to_mat4(float mat[4][4], const float loc[3], const float eul[ { float rmat[3][3], smat[3][3], tmat[3][3]; - /* initialise new matrix */ + /* initialize new matrix */ unit_m4(mat); /* make rotation + scaling part */ @@ -1243,7 +1243,7 @@ void loc_quat_size_to_mat4(float mat[4][4], const float loc[3], const float quat { float rmat[3][3], smat[3][3], tmat[3][3]; - /* initialise new matrix */ + /* initialize new matrix */ unit_m4(mat); /* make rotation + scaling part */ diff --git a/source/blender/blenlib/intern/path_util.c b/source/blender/blenlib/intern/path_util.c index 084af4be573..ec8e1cf6b82 100644 --- a/source/blender/blenlib/intern/path_util.c +++ b/source/blender/blenlib/intern/path_util.c @@ -694,7 +694,7 @@ int BLI_path_abs(char *path, const char *basepath) BLI_char_switch(base, '\\', '/'); /* Paths starting with // will get the blend file as their base, - * this isnt standard in any os but is uesed in blender all over the place */ + * this isnt standard in any os but is used in blender all over the place */ if (wasrelative) { char *lslash= BLI_last_slash(base); if (lslash) { @@ -1748,9 +1748,9 @@ static int add_win32_extension(char *name) * the name to its 8.3 version to prevent problems with * spaces and stuff. Final result is returned in fullname. * -* @param fullname The full path and full name of the executable +* \param fullname The full path and full name of the executable * (must be FILE_MAX minimum) -* @param name The name of the executable (usually argv[0]) to be checked +* \param name The name of the executable (usually argv[0]) to be checked */ static void bli_where_am_i(char *fullname, const size_t maxlen, const char *name) { @@ -1854,9 +1854,9 @@ const char *BLI_program_dir(void) * * Also make sure the temp dir has a trailing slash * -* @param fullname The full path to the temp directory -* @param maxlen The size of the fullname buffer -* @param userdir Directory specified in user preferences +* \param fullname The full path to the temp directory +* \param maxlen The size of the fullname buffer +* \param userdir Directory specified in user preferences */ static void BLI_where_is_temp(char *fullname, const size_t maxlen, char *userdir) { diff --git a/source/blender/blenlib/intern/string_utf8.c b/source/blender/blenlib/intern/string_utf8.c index cf865b5686d..c958648836b 100644 --- a/source/blender/blenlib/intern/string_utf8.c +++ b/source/blender/blenlib/intern/string_utf8.c @@ -369,7 +369,7 @@ unsigned int BLI_str_utf8_as_unicode(const char *p) return result; } -/* varient that increments the length */ +/* variant that increments the length */ unsigned int BLI_str_utf8_as_unicode_and_size(const char *p, size_t *index) { int i, mask = 0, len; @@ -384,7 +384,7 @@ unsigned int BLI_str_utf8_as_unicode_and_size(const char *p, size_t *index) return result; } -/* another varient that steps over the index, +/* another variant that steps over the index, * note, currently this also falls back to latin1 for text drawing. */ unsigned int BLI_str_utf8_as_unicode_step(const char *p, size_t *index) { @@ -433,7 +433,7 @@ unsigned int BLI_str_utf8_as_unicode_step(const char *p, size_t *index) /** * BLI_str_utf8_from_unicode: * @c a Unicode character code - * @param outbuf output buffer, must have at least 6 bytes of space. + * \param outbuf output buffer, must have at least 6 bytes of space. * If %NULL, the length will be computed and returned * and nothing will be written to outbuf. * |