diff options
Diffstat (limited to 'source/blender/blenlib')
-rw-r--r-- | source/blender/blenlib/BLI_dlrbTree.h | 2 | ||||
-rw-r--r-- | source/blender/blenlib/intern/BLI_kdopbvh.c | 2 | ||||
-rw-r--r-- | source/blender/blenlib/intern/freetypefont.c | 4 | ||||
-rw-r--r-- | source/blender/blenlib/intern/graph.c | 16 | ||||
-rw-r--r-- | source/blender/blenlib/intern/listbase.c | 12 | ||||
-rw-r--r-- | source/blender/blenlib/intern/path_util.c | 14 | ||||
-rw-r--r-- | source/blender/blenlib/intern/pbvh.c | 6 | ||||
-rw-r--r-- | source/blender/blenlib/intern/storage.c | 2 | ||||
-rw-r--r-- | source/blender/blenlib/intern/string.c | 2 | ||||
-rw-r--r-- | source/blender/blenlib/intern/time.c | 2 | ||||
-rw-r--r-- | source/blender/blenlib/intern/winstuff.c | 4 |
11 files changed, 33 insertions, 33 deletions
diff --git a/source/blender/blenlib/BLI_dlrbTree.h b/source/blender/blenlib/BLI_dlrbTree.h index d04e544376a..bdde8dbd597 100644 --- a/source/blender/blenlib/BLI_dlrbTree.h +++ b/source/blender/blenlib/BLI_dlrbTree.h @@ -46,7 +46,7 @@ /* Basic Layout for a Node */ typedef struct DLRBT_Node { /* ListBase capabilities */ - struct DLRBT_Node *next, *prev; + struct DLRBT_Node *next, *prev; /* Tree Associativity settings */ struct DLRBT_Node *left, *right; diff --git a/source/blender/blenlib/intern/BLI_kdopbvh.c b/source/blender/blenlib/intern/BLI_kdopbvh.c index 9fbbd7d498d..414612dcce5 100644 --- a/source/blender/blenlib/intern/BLI_kdopbvh.c +++ b/source/blender/blenlib/intern/BLI_kdopbvh.c @@ -1469,7 +1469,7 @@ static void iterative_raycast(BVHRayCastData *data, BVHNode *node) } else { node = node->children[0]; - } + } } } #endif diff --git a/source/blender/blenlib/intern/freetypefont.c b/source/blender/blenlib/intern/freetypefont.c index 4ccfb625241..018d64b86a7 100644 --- a/source/blender/blenlib/intern/freetypefont.c +++ b/source/blender/blenlib/intern/freetypefont.c @@ -282,7 +282,7 @@ static void freetypechar_to_vchar(FT_Face face, FT_ULong charcode, VFontData *vf } } if (npoints) MEM_freeN(npoints); - if (onpoints) MEM_freeN(onpoints); + if (onpoints) MEM_freeN(onpoints); } } @@ -404,7 +404,7 @@ static VFontData *objfnt_to_ftvfontdata(PackedFile *pf) lcode = charcode; } - return vfd; + return vfd; } diff --git a/source/blender/blenlib/intern/graph.c b/source/blender/blenlib/intern/graph.c index 51d7cb58b00..a93bbd97b51 100644 --- a/source/blender/blenlib/intern/graph.c +++ b/source/blender/blenlib/intern/graph.c @@ -353,12 +353,12 @@ int BLI_isGraphCyclic(BGraph *graph) /* Mark all nodes as not visited */ BLI_flagNodes(graph, 0); - /* detectCycles in subgraphs */ + /* detectCycles in subgraphs */ for (node = graph->nodes.first; node && value == 0; node = node->next) { /* only for nodes in subgraphs that haven't been visited yet */ if (node->flag == 0) { value = value || detectCycle(node, NULL); - } + } } return value; @@ -639,11 +639,11 @@ static void handleRadialSymmetry(BGraph *graph, BNode *root_node, int depth, flo /* if not dispatching already and on last arc * Dispatch using current arc as last - * */ + */ if (dispatch == 0 && i == total - 1) { last = i; dispatch = 1; - } + } if (dispatch) { int sub_total = last - first + 1; @@ -796,7 +796,7 @@ static void markdownSecondarySymmetry(BGraph *graph, BNode *node, int depth, int /* count the number of branches in this symmetry group * and determinate the axis of symmetry - * */ + */ for (i = 0; i < node->degree; i++) { BArc *connectedArc = node->arcs[i]; @@ -821,7 +821,7 @@ static void markdownSecondarySymmetry(BGraph *graph, BNode *node, int depth, int handleRadialSymmetry(graph, node, depth, axis, limit); } - /* markdown secondary symetries */ + /* markdown secondary symetries */ for (i = 0; i < node->degree; i++) { BArc *connectedArc = node->arcs[i]; @@ -836,7 +836,7 @@ static void markdownSymmetryArc(BGraph *graph, BArc *arc, BNode *node, int level { int i; - /* if arc is null, we start straight from a node */ + /* if arc is null, we start straight from a node */ if (arc) { arc->symmetry_level = level; @@ -875,7 +875,7 @@ static void markdownSymmetryArc(BGraph *graph, BArc *arc, BNode *node, int level /* not on the symmetry axis */ issymmetryAxis = 0; break; - } + } } } diff --git a/source/blender/blenlib/intern/listbase.c b/source/blender/blenlib/intern/listbase.c index ad718ed8e11..9f6f409c473 100644 --- a/source/blender/blenlib/intern/listbase.c +++ b/source/blender/blenlib/intern/listbase.c @@ -141,7 +141,7 @@ void BLI_insertlink(ListBase *listbase, void *vprevlink, void *vnewlink) if (listbase == NULL) return; /* empty list */ - if (listbase->first == NULL) { + if (listbase->first == NULL) { listbase->first = newlink; listbase->last = newlink; @@ -149,7 +149,7 @@ void BLI_insertlink(ListBase *listbase, void *vprevlink, void *vnewlink) } /* insert before first element */ - if (prevlink == NULL) { + if (prevlink == NULL) { newlink->next = listbase->first; newlink->prev = NULL; newlink->next->prev = newlink; @@ -203,14 +203,14 @@ void BLI_insertlinkafter(ListBase *listbase, void *vprevlink, void *vnewlink) if (listbase == NULL) return; /* empty list */ - if (listbase->first == NULL) { + if (listbase->first == NULL) { listbase->first = newlink; listbase->last = newlink; return; } /* insert at head of list */ - if (prevlink == NULL) { + if (prevlink == NULL) { newlink->prev = NULL; newlink->next = listbase->first; ((Link *)listbase->first)->prev = newlink; @@ -238,14 +238,14 @@ void BLI_insertlinkbefore(ListBase *listbase, void *vnextlink, void *vnewlink) if (listbase == NULL) return; /* empty list */ - if (listbase->first == NULL) { + if (listbase->first == NULL) { listbase->first = newlink; listbase->last = newlink; return; } /* insert at end of list */ - if (nextlink == NULL) { + if (nextlink == NULL) { newlink->prev = listbase->last; newlink->next = NULL; ((Link *)listbase->last)->next = newlink; diff --git a/source/blender/blenlib/intern/path_util.c b/source/blender/blenlib/intern/path_util.c index 0ae18d6e177..444daf8817c 100644 --- a/source/blender/blenlib/intern/path_util.c +++ b/source/blender/blenlib/intern/path_util.c @@ -330,7 +330,7 @@ void BLI_cleanup_path(const char *relabase, char *dir) if (strcmp(dir, ".") == 0) { /* happens for example in FILE_MAIN */ get_default_root(dir); return; - } + } while ( (start = strstr(dir, "\\..\\")) ) { eind = start + strlen("\\..\\") - 1; @@ -492,7 +492,7 @@ void BLI_path_rel(char *file, const char *relfile) */ if (*q != '/') { while ( (q >= file) && (*q != '/') ) { --q; --p; } - } + } else if (*p != '/') { while ( (p >= temp) && (*p != '/') ) { --p; --q; } } @@ -544,7 +544,7 @@ int BLI_parent_dir(char *path) BLI_cleanup_dir(NULL, tmp); if (!BLI_testextensie(tmp, parent_dir)) { - BLI_strncpy(path, tmp, sizeof(tmp)); + BLI_strncpy(path, tmp, sizeof(tmp)); return 1; } else { @@ -691,7 +691,7 @@ int BLI_path_abs(char *path, const char *basepath) * of paths and solving some problems (and prevent potential future * ones) -jesterKing. */ BLI_char_switch(tmp, '\\', '/'); - BLI_char_switch(base, '\\', '/'); + BLI_char_switch(base, '\\', '/'); /* Paths starting with // will get the blend file as their base, * this isn't standard in any os but is used in blender all over the place */ @@ -1300,7 +1300,7 @@ void BLI_make_file_string(const char *relabase, char *string, const char *dir, BLI_char_switch(file, '\\', '/'); #endif - /* Resolve relative references */ + /* Resolve relative references */ if (relabase && dir[0] == '/' && dir[1] == '/') { char *lslash; @@ -1321,7 +1321,7 @@ void BLI_make_file_string(const char *relabase, char *string, const char *dir, else { /* no drive specified */ /* first option: get the drive from the relabase if it has one */ if (relabase && strlen(relabase) >= 2 && relabase[1] == ':') { - BLI_strncpy(string, relabase, 3); + BLI_strncpy(string, relabase, 3); string[2] = '\\'; string[3] = '\0'; } @@ -1337,7 +1337,7 @@ void BLI_make_file_string(const char *relabase, char *string, const char *dir, strcat(string, dir); - /* Make sure string ends in one (and only one) slash */ + /* Make sure string ends in one (and only one) slash */ /* first trim all slashes from the end of the string */ sl = strlen(string); while (sl > 0 && (string[sl - 1] == '/' || string[sl - 1] == '\\') ) { diff --git a/source/blender/blenlib/intern/pbvh.c b/source/blender/blenlib/intern/pbvh.c index d3d8d371f60..bf237ffd75a 100644 --- a/source/blender/blenlib/intern/pbvh.c +++ b/source/blender/blenlib/intern/pbvh.c @@ -1630,9 +1630,9 @@ static PlaneAABBIsect test_planes_aabb(const float bb_min[3], PlaneAABBIsect ret = ISECT_INSIDE; int i, axis; - for (i = 0; i < 4; ++i) { + for (i = 0; i < 4; ++i) { for (axis = 0; axis < 3; ++axis) { - if (planes[i][axis] > 0) { + if (planes[i][axis] > 0) { vmin[axis] = bb_min[axis]; vmax[axis] = bb_max[axis]; } @@ -1646,7 +1646,7 @@ static PlaneAABBIsect test_planes_aabb(const float bb_min[3], return ISECT_OUTSIDE; else if (dot_v3v3(planes[i], vmax) + planes[i][3] >= 0) ret = ISECT_INTERSECT; - } + } return ret; } diff --git a/source/blender/blenlib/intern/storage.c b/source/blender/blenlib/intern/storage.c index dec04939724..1358fdd2a62 100644 --- a/source/blender/blenlib/intern/storage.c +++ b/source/blender/blenlib/intern/storage.c @@ -187,7 +187,7 @@ double BLI_dir_free_space(const char *dir) #endif #if defined(__sun__) || defined(__sun) || defined(__NetBSD__) - if (statvfs(name, &disk)) return(-1); + if (statvfs(name, &disk)) return(-1); #elif !defined(__FreeBSD__) && !defined(linux) && (defined(__sparc) || defined(__sparc__)) /* WARNING - This may not be supported by geeneric unix os's - Campbell */ if (statfs(name, &disk, sizeof(struct statfs), 0)) return(-1); diff --git a/source/blender/blenlib/intern/string.c b/source/blender/blenlib/intern/string.c index 4b64a650b52..40b2fc20cfa 100644 --- a/source/blender/blenlib/intern/string.c +++ b/source/blender/blenlib/intern/string.c @@ -377,7 +377,7 @@ int BLI_natstrcmp(const char *s1, const char *s2) c2 = tolower(s2[d2]); } - /* first check for '.' so "foo.bar" comes before "foo 1.bar" */ + /* first check for '.' so "foo.bar" comes before "foo 1.bar" */ if (c1 == '.' && c2 != '.') return -1; if (c1 != '.' && c2 == '.') diff --git a/source/blender/blenlib/intern/time.c b/source/blender/blenlib/intern/time.c index bf9720fee09..078fc2c295b 100644 --- a/source/blender/blenlib/intern/time.c +++ b/source/blender/blenlib/intern/time.c @@ -44,7 +44,7 @@ double PIL_check_seconds_timer(void) __int64 ifreq; hasperfcounter = QueryPerformanceFrequency((LARGE_INTEGER *) &ifreq); perffreq = (double) ifreq; - } + } if (hasperfcounter) { __int64 count; diff --git a/source/blender/blenlib/intern/winstuff.c b/source/blender/blenlib/intern/winstuff.c index a0b31f8d5b8..68d9d74cca4 100644 --- a/source/blender/blenlib/intern/winstuff.c +++ b/source/blender/blenlib/intern/winstuff.c @@ -293,7 +293,7 @@ void get_default_root(char *root) root[3] = '\0'; if (GetFileAttributes(root) != 0xFFFFFFFF) { rc = i; - break; + break; } } } @@ -304,7 +304,7 @@ void get_default_root(char *root) root[2] = '\\'; root[3] = '\0'; } - } + } } } |