Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrecht Van Lommel <brecht@blender.org>2020-10-01 15:29:26 +0300
committerBrecht Van Lommel <brecht@blender.org>2020-10-01 15:29:45 +0300
commit2caa6dd7f87ac5e0fecbefca9054d7a3ca7948a2 (patch)
treeb6cc0a5a92451acecf2851acf141dc6ddb52411e
parent5d824c421222f8387dabaeb3db5ef99ded094b01 (diff)
Cleanup: clang-format
-rw-r--r--intern/cycles/kernel/split/kernel_shader_setup.h3
-rw-r--r--source/blender/blenkernel/BKE_editmesh_bvh.h2
-rw-r--r--source/blender/makesrna/intern/rna_tracking.c1
-rw-r--r--source/blender/python/mathutils/mathutils_Matrix.c17
4 files changed, 11 insertions, 12 deletions
diff --git a/intern/cycles/kernel/split/kernel_shader_setup.h b/intern/cycles/kernel/split/kernel_shader_setup.h
index 4c3c06b7124..900cbcb869c 100644
--- a/intern/cycles/kernel/split/kernel_shader_setup.h
+++ b/intern/cycles/kernel/split/kernel_shader_setup.h
@@ -40,7 +40,8 @@ ccl_device void kernel_shader_setup(KernelGlobals *kg,
kernel_split_state.queue_data,
kernel_split_params.queue_size,
0);
- } else {
+ }
+ else {
ray_index = QUEUE_EMPTY_SLOT;
}
diff --git a/source/blender/blenkernel/BKE_editmesh_bvh.h b/source/blender/blenkernel/BKE_editmesh_bvh.h
index 8c800ea9529..69d1b4819f8 100644
--- a/source/blender/blenkernel/BKE_editmesh_bvh.h
+++ b/source/blender/blenkernel/BKE_editmesh_bvh.h
@@ -91,7 +91,7 @@ struct BVHTreeOverlap *BKE_bmbvh_overlap(const BMBVHTree *bmtree_a,
unsigned int *r_overlap_tot);
struct BVHTreeOverlap *BKE_bmbvh_overlap_self(const BMBVHTree *bmtree,
- unsigned int *r_overlap_tot);
+ unsigned int *r_overlap_tot);
/** #BKE_bmbvh_new flag parameter. */
enum {
diff --git a/source/blender/makesrna/intern/rna_tracking.c b/source/blender/makesrna/intern/rna_tracking.c
index dd0a2e7d873..6d90a76a2c0 100644
--- a/source/blender/makesrna/intern/rna_tracking.c
+++ b/source/blender/makesrna/intern/rna_tracking.c
@@ -1307,7 +1307,6 @@ static void rna_def_trackingCamera(BlenderRNA *brna)
prop, "P2", "Second coefficient of second order Brown-Conrady tangential distortion");
RNA_def_property_update(prop, NC_MOVIECLIP | NA_EDITED, "rna_tracking_flushUpdate");
-
/* pixel aspect */
prop = RNA_def_property(srna, "pixel_aspect", PROP_FLOAT, PROP_XYZ);
RNA_def_property_float_sdna(prop, NULL, "pixel_aspect");
diff --git a/source/blender/python/mathutils/mathutils_Matrix.c b/source/blender/python/mathutils/mathutils_Matrix.c
index 427fcad5155..0b9fa1841ec 100644
--- a/source/blender/python/mathutils/mathutils_Matrix.c
+++ b/source/blender/python/mathutils/mathutils_Matrix.c
@@ -1718,15 +1718,14 @@ static PyObject *Matrix_adjugate(MatrixObject *self)
Py_RETURN_NONE;
}
-PyDoc_STRVAR(
- Matrix_adjugated_doc,
- ".. method:: adjugated()\n"
- "\n"
- " Return an adjugated copy of the matrix.\n"
- "\n"
- " :return: the adjugated matrix.\n"
- " :rtype: :class:`Matrix`\n"
- " :raises ValueError: if the matrix cannot be adjugated\n");
+PyDoc_STRVAR(Matrix_adjugated_doc,
+ ".. method:: adjugated()\n"
+ "\n"
+ " Return an adjugated copy of the matrix.\n"
+ "\n"
+ " :return: the adjugated matrix.\n"
+ " :rtype: :class:`Matrix`\n"
+ " :raises ValueError: if the matrix cannot be adjugated\n");
static PyObject *Matrix_adjugated(MatrixObject *self)
{
return matrix__apply_to_copy(Matrix_adjugate, self);