[Bf-blender-cvs] [5513da65b24] master: Cleanup: trailing space for BLI
Campbell Barton
noreply at git.blender.org
Sun Jun 17 16:34:59 CEST 2018
Commit: 5513da65b24a3ce77b1709acea841475115f3a7a
Author: Campbell Barton
Date: Sun Jun 17 16:32:54 2018 +0200
Branches: master
https://developer.blender.org/rB5513da65b24a3ce77b1709acea841475115f3a7a
Cleanup: trailing space for BLI
===================================================================
M source/blender/blenlib/BLI_dlrbTree.h
M source/blender/blenlib/BLI_dynstr.h
M source/blender/blenlib/BLI_edgehash.h
M source/blender/blenlib/BLI_graph.h
M source/blender/blenlib/BLI_heap.h
M source/blender/blenlib/BLI_kdtree.h
M source/blender/blenlib/BLI_linklist.h
M source/blender/blenlib/BLI_linklist_stack.h
M source/blender/blenlib/BLI_math_geom.h
M source/blender/blenlib/BLI_math_matrix.h
M source/blender/blenlib/BLI_mempool.h
M source/blender/blenlib/BLI_rand.h
M source/blender/blenlib/BLI_smallhash.h
M source/blender/blenlib/BLI_sys_types.h
M source/blender/blenlib/BLI_threads.h
M source/blender/blenlib/BLI_utildefines.h
M source/blender/blenlib/BLI_winstuff.h
M source/blender/blenlib/PIL_time.h
M source/blender/blenlib/intern/BLI_dial_2d.c
M source/blender/blenlib/intern/BLI_dynstr.c
M source/blender/blenlib/intern/BLI_kdopbvh.c
M source/blender/blenlib/intern/BLI_kdtree.c
M source/blender/blenlib/intern/BLI_linklist.c
M source/blender/blenlib/intern/DLRB_tree.c
M source/blender/blenlib/intern/boxpack_2d.c
M source/blender/blenlib/intern/dynlib.c
M source/blender/blenlib/intern/fileops.c
M source/blender/blenlib/intern/freetypefont.c
M source/blender/blenlib/intern/graph.c
M source/blender/blenlib/intern/gsqueue.c
M source/blender/blenlib/intern/jitter_2d.c
M source/blender/blenlib/intern/listbase.c
M source/blender/blenlib/intern/math_geom.c
M source/blender/blenlib/intern/noise.c
M source/blender/blenlib/intern/path_util.c
M source/blender/blenlib/intern/rand.c
M source/blender/blenlib/intern/scanfill.c
M source/blender/blenlib/intern/string.c
M source/blender/blenlib/intern/string_utils.c
M source/blender/blenlib/intern/threads.c
M source/blender/blenlib/intern/time.c
M source/blender/blenlib/intern/voxel.c
M source/blender/blenlib/intern/winstuff.c
M source/blender/blenlib/intern/winstuff_dir.c
===================================================================
diff --git a/source/blender/blenlib/BLI_dlrbTree.h b/source/blender/blenlib/BLI_dlrbTree.h
index 05b67e358a4..6e47fd4ddb3 100644
--- a/source/blender/blenlib/BLI_dlrbTree.h
+++ b/source/blender/blenlib/BLI_dlrbTree.h
@@ -47,11 +47,11 @@
typedef struct DLRBT_Node {
/* ListBase capabilities */
struct DLRBT_Node *next, *prev;
-
+
/* Tree Associativity settings */
struct DLRBT_Node *left, *right;
struct DLRBT_Node *parent;
-
+
char tree_col;
/* ... for nice alignment, next item should usually be a char too... */
} DLRBT_Node;
@@ -75,18 +75,18 @@ typedef struct DLRBT_Tree {
/* Callback Types --------------------------------- */
-/* return -1, 0, 1 for whether the given data is less than, equal to, or greater than the given node
+/* return -1, 0, 1 for whether the given data is less than, equal to, or greater than the given node
* - node: <DLRBT_Node> the node to compare to
* - data: pointer to the relevant data or values stored in the bitpattern dependent on the function
*/
typedef short (*DLRBT_Comparator_FP)(void *node, void *data);
-/* return a new node instance wrapping the given data
+/* return a new node instance wrapping the given data
* - data: pointer to the relevant data to create a subclass of node from
*/
typedef DLRBT_Node *(*DLRBT_NAlloc_FP)(void *data);
-/* update an existing node instance accordingly to be in sync with the given data *
+/* update an existing node instance accordingly to be in sync with the given data *
* - node: <DLRBT_Node> the node to update
* - data: pointer to the relevant data or values stored in the bitpattern dependent on the function
*/
@@ -130,28 +130,28 @@ short BLI_dlrbTree_contains(DLRBT_Tree *tree, DLRBT_Comparator_FP cmp_cb, void *
/* Node Operations (Managed) --------------------- */
-/* These methods automate the process of adding/removing nodes from the BST,
+/* These methods automate the process of adding/removing nodes from the BST,
* using the supplied data and callbacks
*/
/* Add the given data to the tree, and return the node added */
// NOTE: for duplicates, the update_cb is called (if available), and the existing node is returned
-DLRBT_Node *BLI_dlrbTree_add(DLRBT_Tree *tree, DLRBT_Comparator_FP cmp_cb,
+DLRBT_Node *BLI_dlrbTree_add(DLRBT_Tree *tree, DLRBT_Comparator_FP cmp_cb,
DLRBT_NAlloc_FP new_cb, DLRBT_NUpdate_FP update_cb, void *data);
/* Remove the given element from the tree and balance again */
-// FIXME: this is not implemented yet...
+// FIXME: this is not implemented yet...
// void BLI_dlrbTree_remove(DLRBT_Tree *tree, DLRBT_Node *node);
/* Node Operations (Manual) --------------------- */
-/* These methods require custom code for creating BST nodes and adding them to the
+/* These methods require custom code for creating BST nodes and adding them to the
* tree in special ways, such that the node can then be balanced.
*
* It is recommended that these methods are only used where the other method is too cumbersome...
*/
-/* Balance the tree after the given node has been added to it
+/* Balance the tree after the given node has been added to it
* (using custom code, in the Binary Tree way).
*/
void BLI_dlrbTree_insert(DLRBT_Tree *tree, DLRBT_Node *node);
diff --git a/source/blender/blenlib/BLI_dynstr.h b/source/blender/blenlib/BLI_dynstr.h
index b26accc7f78..796dd225404 100644
--- a/source/blender/blenlib/BLI_dynstr.h
+++ b/source/blender/blenlib/BLI_dynstr.h
@@ -24,7 +24,7 @@
*
* ***** END GPL LICENSE BLOCK *****
*/
-
+
#ifndef __BLI_DYNSTR_H__
#define __BLI_DYNSTR_H__
diff --git a/source/blender/blenlib/BLI_edgehash.h b/source/blender/blenlib/BLI_edgehash.h
index 41789201265..83b519fc750 100644
--- a/source/blender/blenlib/BLI_edgehash.h
+++ b/source/blender/blenlib/BLI_edgehash.h
@@ -19,7 +19,7 @@
*
* ***** END GPL LICENSE BLOCK *****
*/
-
+
#ifndef __BLI_EDGEHASH_H__
#define __BLI_EDGEHASH_H__
diff --git a/source/blender/blenlib/BLI_graph.h b/source/blender/blenlib/BLI_graph.h
index f25db80e95e..0b316d3c5bb 100644
--- a/source/blender/blenlib/BLI_graph.h
+++ b/source/blender/blenlib/BLI_graph.h
@@ -51,9 +51,9 @@ typedef void (*AxialSymmetry)(struct BNode *root_node, struct BNode *node1, stru
typedef struct BGraph {
ListBase arcs;
ListBase nodes;
-
+
float length;
-
+
/* function pointer to deal with custom fonctionnality */
FreeArc free_arc;
FreeNode free_node;
@@ -68,7 +68,7 @@ typedef struct BNode {
int degree;
struct BArc **arcs;
-
+
int subgraph_index;
int symmetry_level;
@@ -114,17 +114,17 @@ typedef struct BArcIterator {
NextNFct nextN;
PreviousFct previous;
StoppedFct stopped;
-
+
float *p, *no;
float size;
-
+
int length;
int index;
} BArcIterator;
/* Helper structure for radial symmetry */
typedef struct RadialArc {
- struct BArc *arc;
+ struct BArc *arc;
float n[3]; /* normalized vector joining the nodes of the arc */
} RadialArc;
diff --git a/source/blender/blenlib/BLI_heap.h b/source/blender/blenlib/BLI_heap.h
index 19e162d777f..771b9dabe4d 100644
--- a/source/blender/blenlib/BLI_heap.h
+++ b/source/blender/blenlib/BLI_heap.h
@@ -17,7 +17,7 @@
*
* ***** END GPL LICENSE BLOCK *****
*/
-
+
#ifndef __BLI_HEAP_H__
#define __BLI_HEAP_H__
diff --git a/source/blender/blenlib/BLI_kdtree.h b/source/blender/blenlib/BLI_kdtree.h
index 18908f8c551..689c07e05db 100644
--- a/source/blender/blenlib/BLI_kdtree.h
+++ b/source/blender/blenlib/BLI_kdtree.h
@@ -20,7 +20,7 @@
*
* ***** END GPL LICENSE BLOCK *****
*/
-
+
#ifndef __BLI_KDTREE_H__
#define __BLI_KDTREE_H__
diff --git a/source/blender/blenlib/BLI_linklist.h b/source/blender/blenlib/BLI_linklist.h
index 7eec54e67e1..214915163c7 100644
--- a/source/blender/blenlib/BLI_linklist.h
+++ b/source/blender/blenlib/BLI_linklist.h
@@ -24,7 +24,7 @@
*
* ***** END GPL LICENSE BLOCK *****
*/
-
+
#ifndef __BLI_LINKLIST_H__
#define __BLI_LINKLIST_H__
diff --git a/source/blender/blenlib/BLI_linklist_stack.h b/source/blender/blenlib/BLI_linklist_stack.h
index dd6d737f111..fad0b4e7552 100644
--- a/source/blender/blenlib/BLI_linklist_stack.h
+++ b/source/blender/blenlib/BLI_linklist_stack.h
@@ -24,7 +24,7 @@
*
* ***** END GPL LICENSE BLOCK *****
*/
-
+
#ifndef __BLI_LINKLIST_STACK_H__
#define __BLI_LINKLIST_STACK_H__
diff --git a/source/blender/blenlib/BLI_math_geom.h b/source/blender/blenlib/BLI_math_geom.h
index ff80d15ea5d..89c2ab00688 100644
--- a/source/blender/blenlib/BLI_math_geom.h
+++ b/source/blender/blenlib/BLI_math_geom.h
@@ -385,7 +385,7 @@ void interp_barycentric_tri_v3(float data[3][3], float u, float v, float res[3])
/***************************** View & Projection *****************************/
-void lookat_m4(float mat[4][4], float vx, float vy,
+void lookat_m4(float mat[4][4], float vx, float vy,
float vz, float px, float py, float pz, float twist);
void polarview_m4(float mat[4][4], float dist, float azimuth,
float incidence, float twist);
diff --git a/source/blender/blenlib/BLI_math_matrix.h b/source/blender/blenlib/BLI_math_matrix.h
index 173ef6861e6..600042602e0 100644
--- a/source/blender/blenlib/BLI_math_matrix.h
+++ b/source/blender/blenlib/BLI_math_matrix.h
@@ -17,7 +17,7 @@
*
* The Original Code is Copyright (C) 2001-2002 by NaN Holding BV.
* All rights reserved.
-
+
* The Original Code is: some of this file.
*
* ***** END GPL LICENSE BLOCK *****
diff --git a/source/blender/blenlib/BLI_mempool.h b/source/blender/blenlib/BLI_mempool.h
index 45efb8d7ef1..dfa6fdd2625 100644
--- a/source/blender/blenlib/BLI_mempool.h
+++ b/source/blender/blenlib/BLI_mempool.h
@@ -24,7 +24,7 @@
*
* ***** END GPL LICENSE BLOCK *****
*/
-
+
#ifndef __BLI_MEMPOOL_H__
#define __BLI_MEMPOOL_H__
diff --git a/source/blender/blenlib/BLI_rand.h b/source/blender/blenlib/BLI_rand.h
index 69b23b2473f..5bb7ab391b9 100644
--- a/source/blender/blenlib/BLI_rand.h
+++ b/source/blender/blenlib/BLI_rand.h
@@ -24,7 +24,7 @@
*
* ***** END GPL LICENSE BLOCK *****
*/
-
+
#ifndef __BLI_RAND_H__
#define __BLI_RAND_H__
diff --git a/source/blender/blenlib/BLI_smallhash.h b/source/blender/blenlib/BLI_smallhash.h
index 495fc94a53c..d1bcf4e9dc6 100644
--- a/source/blender/blenlib/BLI_smallhash.h
+++ b/source/blender/blenlib/BLI_smallhash.h
@@ -24,7 +24,7 @@
*
* ***** END GPL LICENSE BLOCK *****
*/
-
+
#ifndef __BLI_SMALLHASH_H__
#define __BLI_SMALLHASH_H__
diff --git a/source/blender/blenlib/BLI_sys_types.h b/source/blender/blenlib/BLI_sys_types.h
index 80ee50621ca..ccafa1cf327 100644
--- a/source/blender/blenlib/BLI_sys_types.h
+++ b/source/blender/blenlib/BLI_sys_types.h
@@ -87,7 +87,7 @@ typedef unsigned short ushort;
typedef unsigned long ulong;
typedef unsigned char uchar;
-#ifdef __cplusplus
+#ifdef __cplusplus
}
#endif
diff --git a/source/blender/blenlib/BLI_threads.h b/source/blender/blenlib/BLI_threads.h
index 96bb739f683..87a1467e573 100644
--- a/source/blender/blenlib/BLI_threads.h
+++ b/source/blender/blenlib/BLI_threads.h
@@ -26,7 +26,7 @@
*/
#ifndef __BLI_THREADS_H__
-#define __BLI_THREADS_H__
+#define __BLI_THREADS_H__
/** \file BLI_threads.h
* \ingroup bli
@@ -74,7 +74,7 @@ void BLI_threaded_malloc_end(void);
int BLI_system_thread_count(void); /* gets the number of threads the system can make use of */
void BLI_system_num_threads_override_set(int num);
int BLI_system_num_threads_override_get(void);
-
+
/* Global Mutex Locks
*
* One custom lock available now. can be extended. */
@@ -155,7 +155,7 @@ void BLI_ticket_mutex_lock(TicketMutex *ticket);
void BLI_ticket_mutex_unlock(TicketMutex *ticket);
/* Condition */
-
+
typedef pthread_cond_t ThreadCondition;
void BLI_condition_init(ThreadCondition *cond);
diff --git a/source/blender/blenlib/BLI_utildefines.h b/source/blender/blenlib/BLI_utildefines.h
index 75ddb5e739c..3d4b227ffa7 100644
--- a/source/blender/blenlib/BLI_utildefines.h
+++ b/source/blender/blenlib/BLI_utildefines.h
@@ -552,13 +552,13 @@ extern bool BLI_memory_is_zero(const void *arr, const size_t arr_size);
/* UNUSED macro, for function argument */
-#
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list