Merge branch 'master' into blender2.8

6 files changed, 45 insertions, 44 deletions

diff --git a/source/blender/blenlib/BLI_dlrbTree.h b/source/blender/blenlib/BLI_dlrbTree.h
index 6e47fd4ddb3..e776f594a84 100644
--- a/source/blender/blenlib/BLI_dlrbTree.h
+++ b/source/blender/blenlib/BLI_dlrbTree.h
@@ -76,19 +76,19 @@ 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
- *	- node: <DLRBT_Node> the node to compare to
- *	- data: pointer to the relevant data or values stored in the bitpattern dependent on the function
+ * - 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
- *	- data: pointer to the relevant data to create a subclass of node from
+ * - 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 *
- *  - node: <DLRBT_Node> the node to update
- *	- data: pointer to the relevant data or values stored in the bitpattern dependent on the function
+ * - node: <DLRBT_Node> the node to update
+ * - data: pointer to the relevant data or values stored in the bitpattern dependent on the function
  */
 typedef void (*DLRBT_NUpdate_FP)(void *node, void *data);
 
diff --git a/source/blender/blenlib/BLI_math.h b/source/blender/blenlib/BLI_math.h
index ec3fbdc9bfc..5bdf8b7791f 100644
--- a/source/blender/blenlib/BLI_math.h
+++ b/source/blender/blenlib/BLI_math.h
@@ -28,23 +28,24 @@
 
 /** \file BLI_math.h
  *  \ingroup bli
- *  \section mathabbrev Abbreviations
  *
- *  - ``fl`` = float
- *  - ``db`` = double
- *  - ``v2`` = vec2 = vector 2
- *  - ``v3`` = vec3 = vector 3
- *  - ``v4`` = vec4 = vector 4
- *  - ``vn`` = vec4 = vector N dimensions, *passed as an arg, after the vector*.
- *  - ``qt`` = quat = quaternion
- *  - ``dq`` = dquat = dual quaternion
- *  - ``m2`` = mat2 = matrix 2x2
- *  - ``m3`` = mat3 = matrix 3x3
- *  - ``m4`` = mat4 = matrix 4x4
- *  - ``eul`` = euler rotation
- *  - ``eulO`` = euler with order
- *  - ``plane`` = plane 4, (vec3, distance)
- *  - ``plane3`` = plane 3 (same as a ``plane`` with a zero 4th component)
+ * \section mathabbrev Abbreviations
+ *
+ * - ``fl`` = float
+ * - ``db`` = double
+ * - ``v2`` = vec2 = vector 2
+ * - ``v3`` = vec3 = vector 3
+ * - ``v4`` = vec4 = vector 4
+ * - ``vn`` = vec4 = vector N dimensions, *passed as an arg, after the vector*.
+ * - ``qt`` = quat = quaternion
+ * - ``dq`` = dquat = dual quaternion
+ * - ``m2`` = mat2 = matrix 2x2
+ * - ``m3`` = mat3 = matrix 3x3
+ * - ``m4`` = mat4 = matrix 4x4
+ * - ``eul`` = euler rotation
+ * - ``eulO`` = euler with order
+ * - ``plane`` = plane 4, (vec3, distance)
+ * - ``plane3`` = plane 3 (same as a ``plane`` with a zero 4th component)
  *
  * \subsection mathabbrev_all Function Type Abbreviations
  *
@@ -57,13 +58,13 @@
  * - ``_char`` = char
  * - ``_uchar`` = unsigned char
  *
- *  \section mathvarnames Variable Names
+ * \section mathvarnames Variable Names
  *
- *  - f = single value
- *  - a, b, c = vectors
- *  - r = result vector
- *  - A, B, C = matrices
- *  - R = result matrix
+ * - f = single value
+ * - a, b, c = vectors
+ * - r = result vector
+ * - A, B, C = matrices
+ * - R = result matrix
  */
 
 #include "BLI_math_base.h"
diff --git a/source/blender/blenlib/intern/BLI_kdopbvh.c b/source/blender/blenlib/intern/BLI_kdopbvh.c
index e9098be897f..7959ca4c0f2 100644
--- a/source/blender/blenlib/intern/BLI_kdopbvh.c
+++ b/source/blender/blenlib/intern/BLI_kdopbvh.c
@@ -607,9 +607,9 @@ static int implicit_leafs_index(const BVHBuildHelper *data, const int depth, con
  * All tree types >= 2 are supported.
  *
  * Advantages of the used trees include:
- *  - No need to store child/parent relations (they are implicit);
- *  - Any node child always has an index greater than the parent;
- *  - Brother nodes are sequential in memory;
+ * - No need to store child/parent relations (they are implicit);
+ * - Any node child always has an index greater than the parent;
+ * - Brother nodes are sequential in memory;
  *
  *
  * Some math relations derived for general implicit trees:
@@ -633,9 +633,9 @@ static int implicit_needed_branches(int tree_type, int leafs)
  * This function handles the problem of "sorting" the leafs (along the split_axis).
  *
  * It arranges the elements in the given partitions such that:
- *  - any element in partition N is less or equal to any element in partition N+1.
- *  - if all elements are different all partition will get the same subset of elements
- *    as if the array was sorted.
+ * - any element in partition N is less or equal to any element in partition N+1.
+ * - if all elements are different all partition will get the same subset of elements
+ *   as if the array was sorted.
  *
  * partition P is described as the elements in the range ( nth[P], nth[P+1] ]
  *
@@ -732,9 +732,9 @@ static void non_recursive_bvh_div_nodes_task_cb(
 /**
  * This functions builds an optimal implicit tree from the given leafs.
  * Where optimal stands for:
- *  - The resulting tree will have the smallest number of branches;
- *  - At most only one branch will have NULL childs;
- *  - All leafs will be stored at level N or N+1.
+ * - The resulting tree will have the smallest number of branches;
+ * - At most only one branch will have NULL childs;
+ * - All leafs will be stored at level N or N+1.
  *
  * This function creates an implicit tree on branches_array, the leafs are given on the leafs_array.
  *
diff --git a/source/blender/blenlib/intern/DLRB_tree.c b/source/blender/blenlib/intern/DLRB_tree.c
index eb3a79502ae..e331e070a4a 100644
--- a/source/blender/blenlib/intern/DLRB_tree.c
+++ b/source/blender/blenlib/intern/DLRB_tree.c
@@ -102,8 +102,8 @@ static void linkedlist_sync_add_node(DLRBT_Tree *tree, DLRBT_Node *node)
 	linkedlist_sync_add_node(tree, node->left);
 
 	/* now add self
-	 *	- must remove detach from other links first
-	 *	  (for now, only clear own pointers)
+	 * - must remove detach from other links first
+	 *   (for now, only clear own pointers)
 	 */
 	node->prev = node->next = NULL;
 	BLI_addtail((ListBase *)tree, (Link *)node);
diff --git a/source/blender/blenlib/intern/math_matrix.c b/source/blender/blenlib/intern/math_matrix.c
index df7548a9387..462d0737016 100644
--- a/source/blender/blenlib/intern/math_matrix.c
+++ b/source/blender/blenlib/intern/math_matrix.c
@@ -2212,11 +2212,11 @@ void svd_m4(float U[4][4], float s[4], float V[4][4], float A_[4][4])
 		 * negligible elements in the s and e arrays.  On
 		 * completion the variables kase and k are set as follows.
 		 *
-		 * kase = 1	  if s(p) and e[k - 1] are negligible and k<p
-		 * kase = 2	  if s(k) is negligible and k<p
-		 * kase = 3	  if e[k - 1] is negligible, k<p, and
-		 *               s(k), ..., s(p) are not negligible (qr step).
-		 * kase = 4	  if e(p - 1) is negligible (convergence). */
+		 * kase = 1: if s(p) and e[k - 1] are negligible and k<p
+		 * kase = 2: if s(k) is negligible and k<p
+		 * kase = 3: if e[k - 1] is negligible, k<p, and
+		 *              s(k), ..., s(p) are not negligible (qr step).
+		 * kase = 4: if e(p - 1) is negligible (convergence). */
 
 		for (k = p - 2; k >= -1; k--) {
 			if (k == -1) {
diff --git a/source/blender/blenlib/intern/math_rotation.c b/source/blender/blenlib/intern/math_rotation.c
index 17b395036a3..19aff2caa5d 100644
--- a/source/blender/blenlib/intern/math_rotation.c
+++ b/source/blender/blenlib/intern/math_rotation.c
@@ -1477,7 +1477,7 @@ static const RotOrderInfo rotOrders[] = {
 
 /* Get relevant pointer to rotation order set from the array
  * NOTE: since we start at 1 for the values, but arrays index from 0,
- *		 there is -1 factor involved in this process...
+ *       there is -1 factor involved in this process...
  */
 static const RotOrderInfo *get_rotation_order_info(const short order)
 {