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:
authorSybren A. Stüvel <sybren@blender.org>2020-12-04 13:28:56 +0300
committerSybren A. Stüvel <sybren@blender.org>2020-12-04 13:28:56 +0300
commit1166110a9d66af9c5a47cee2be591f50fdc445e8 (patch)
tree48de061c356bf389ea0ab1101241f213fa8df41e /source/blender
parent958df2ed1b6037b98eb73bb8e063732ba851854f (diff)
Cleanup: clang-format
Rerun `make format`. No functional changes.
Diffstat (limited to 'source/blender')
-rw-r--r--source/blender/blenkernel/intern/constraint.c8
-rw-r--r--source/blender/draw/engines/image/image_private.h2
-rw-r--r--source/blender/editors/sculpt_paint/sculpt_face_set.c4
-rw-r--r--source/blender/editors/space_graph/graph_select.c1
-rw-r--r--source/blender/makesdna/DNA_layer_types.h11
-rw-r--r--source/blender/makesdna/DNA_modifier_types.h2
-rw-r--r--source/blender/makesrna/intern/rna_layer.c3
7 files changed, 16 insertions, 15 deletions
diff --git a/source/blender/blenkernel/intern/constraint.c b/source/blender/blenkernel/intern/constraint.c
index 1a16f1d3c6e..28121206a90 100644
--- a/source/blender/blenkernel/intern/constraint.c
+++ b/source/blender/blenkernel/intern/constraint.c
@@ -1627,7 +1627,7 @@ static bConstraintTypeInfo CTI_LOCLIMIT = {
"Limit Location", /* name */
"bLocLimitConstraint", /* struct name */
NULL, /* free data */
- custom_space_id_looper, /* id looper */
+ custom_space_id_looper, /* id looper */
NULL, /* copy data */
NULL, /* new data */
get_space_tar, /* get constraint targets */
@@ -1690,7 +1690,7 @@ static bConstraintTypeInfo CTI_ROTLIMIT = {
"Limit Rotation", /* name */
"bRotLimitConstraint", /* struct name */
NULL, /* free data */
- custom_space_id_looper, /* id looper */
+ custom_space_id_looper, /* id looper */
NULL, /* copy data */
NULL, /* new data */
get_space_tar, /* get constraint targets */
@@ -1757,7 +1757,7 @@ static bConstraintTypeInfo CTI_SIZELIMIT = {
"Limit Scale", /* name */
"bSizeLimitConstraint", /* struct name */
NULL, /* free data */
- custom_space_id_looper, /* id looper */
+ custom_space_id_looper, /* id looper */
NULL, /* copy data */
NULL, /* new data */
get_space_tar, /* get constraint targets */
@@ -2318,7 +2318,7 @@ static bConstraintTypeInfo CTI_SAMEVOL = {
"Maintain Volume", /* name */
"bSameVolumeConstraint", /* struct name */
NULL, /* free data */
- custom_space_id_looper, /* id looper */
+ custom_space_id_looper, /* id looper */
NULL, /* copy data */
samevolume_new_data, /* new data */
get_space_tar, /* get constraint targets */
diff --git a/source/blender/draw/engines/image/image_private.h b/source/blender/draw/engines/image/image_private.h
index ad7ff78cb41..d5821cc5d70 100644
--- a/source/blender/draw/engines/image/image_private.h
+++ b/source/blender/draw/engines/image/image_private.h
@@ -43,7 +43,7 @@ typedef struct IMAGE_PrivateData {
void *lock;
struct ImBuf *ibuf;
struct Image *image;
- struct DRWView* view;
+ struct DRWView *view;
struct GPUTexture *texture;
bool owns_texture;
diff --git a/source/blender/editors/sculpt_paint/sculpt_face_set.c b/source/blender/editors/sculpt_paint/sculpt_face_set.c
index 7c8a4c5a857..ad42750bb92 100644
--- a/source/blender/editors/sculpt_paint/sculpt_face_set.c
+++ b/source/blender/editors/sculpt_paint/sculpt_face_set.c
@@ -1307,8 +1307,8 @@ static int sculpt_face_set_edit_invoke(bContext *C, wmOperator *op, const wmEven
SculptCursorGeometryInfo sgi;
const float mouse[2] = {event->mval[0], event->mval[1]};
if (!SCULPT_cursor_geometry_info_update(C, &sgi, mouse, false)) {
- /* The cursor is not over the mesh. Cancel to avoid editing the last updated Face Set ID. */
- return OPERATOR_CANCELLED;
+ /* The cursor is not over the mesh. Cancel to avoid editing the last updated Face Set ID. */
+ return OPERATOR_CANCELLED;
}
const int active_face_set = SCULPT_active_face_set_get(ss);
diff --git a/source/blender/editors/space_graph/graph_select.c b/source/blender/editors/space_graph/graph_select.c
index 007f99e3ce5..12035ab6b61 100644
--- a/source/blender/editors/space_graph/graph_select.c
+++ b/source/blender/editors/space_graph/graph_select.c
@@ -501,7 +501,6 @@ void GRAPH_OT_select_all(wmOperatorType *ot)
* The selection backend is also reused for the Lasso and Circle select operators.
*/
-
static rctf initialize_box_select_coords(const bAnimContext *ac, const rctf *rectf_view)
{
const View2D *v2d = &ac->region->v2d;
diff --git a/source/blender/makesdna/DNA_layer_types.h b/source/blender/makesdna/DNA_layer_types.h
index 0da7c6b5937..6a91f4857b4 100644
--- a/source/blender/makesdna/DNA_layer_types.h
+++ b/source/blender/makesdna/DNA_layer_types.h
@@ -65,12 +65,13 @@ typedef enum eViewLayerAOVFlag {
/* #ViewLayer.cryptomatte_flag */
typedef enum eViewLayerCryptomatteFlags {
- VIEW_LAYER_CRYPTOMATTE_OBJECT = (1<<0),
- VIEW_LAYER_CRYPTOMATTE_MATERIAL = (1<<1),
- VIEW_LAYER_CRYPTOMATTE_ASSET = (1<<2),
- VIEW_LAYER_CRYPTOMATTE_ACCURATE = (1<<3),
+ VIEW_LAYER_CRYPTOMATTE_OBJECT = (1 << 0),
+ VIEW_LAYER_CRYPTOMATTE_MATERIAL = (1 << 1),
+ VIEW_LAYER_CRYPTOMATTE_ASSET = (1 << 2),
+ VIEW_LAYER_CRYPTOMATTE_ACCURATE = (1 << 3),
} eViewLayerCryptomatteFlags;
-#define VIEW_LAYER_CRYPTOMATTE_ALL (VIEW_LAYER_CRYPTOMATTE_OBJECT | VIEW_LAYER_CRYPTOMATTE_MATERIAL | VIEW_LAYER_CRYPTOMATTE_ASSET)
+#define VIEW_LAYER_CRYPTOMATTE_ALL \
+ (VIEW_LAYER_CRYPTOMATTE_OBJECT | VIEW_LAYER_CRYPTOMATTE_MATERIAL | VIEW_LAYER_CRYPTOMATTE_ASSET)
typedef struct Base {
struct Base *next, *prev;
diff --git a/source/blender/makesdna/DNA_modifier_types.h b/source/blender/makesdna/DNA_modifier_types.h
index edb0a4439d6..af7d7e9310f 100644
--- a/source/blender/makesdna/DNA_modifier_types.h
+++ b/source/blender/makesdna/DNA_modifier_types.h
@@ -1588,7 +1588,7 @@ typedef struct WeightVGProximityModifierData {
/** Name of vertex group to modify/weight. MAX_VGROUP_NAME. */
char defgrp_name[64];
-
+
/* Mapping stuff. */
/** The custom mapping curve!. */
struct CurveMapping *cmap_curve;
diff --git a/source/blender/makesrna/intern/rna_layer.c b/source/blender/makesrna/intern/rna_layer.c
index 0dcbd8a070b..abc4136bae8 100644
--- a/source/blender/makesrna/intern/rna_layer.c
+++ b/source/blender/makesrna/intern/rna_layer.c
@@ -163,7 +163,8 @@ static void rna_ViewLayer_update_render_passes(ID *id)
}
RE_engine_free(engine);
engine = NULL;
- }}
+ }
+}
static PointerRNA rna_ViewLayer_objects_get(CollectionPropertyIterator *iter)
{