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:
authorLukas Stockner <lukas.stockner@freenet.de>2022-04-12 00:49:37 +0300
committerLukas Stockner <lukas.stockner@freenet.de>2022-04-12 00:49:37 +0300
commit3c62e539af9ce3a1eebb5541dd5a2d70e77e6103 (patch)
tree1cabe0304710711aec9ab3e31e7a1e4c5c685ad1
parent484a9146479e05946d291e9886cdf3febca6d05d (diff)
Cleanup: clang-format
-rw-r--r--source/blender/blenkernel/intern/attribute.c6
-rw-r--r--source/blender/editors/interface/interface_layout.c3
-rw-r--r--source/blender/editors/mask/mask_ops.c4
-rw-r--r--source/blender/makesrna/intern/rna_camera.c3
-rw-r--r--source/blender/nodes/geometry/nodes/node_geo_set_material.cc2
5 files changed, 8 insertions, 10 deletions
diff --git a/source/blender/blenkernel/intern/attribute.c b/source/blender/blenkernel/intern/attribute.c
index ba2a63add1f..a25d00d4bff 100644
--- a/source/blender/blenkernel/intern/attribute.c
+++ b/source/blender/blenkernel/intern/attribute.c
@@ -541,8 +541,7 @@ CustomDataLayer *BKE_id_attribute_subset_active_get(const ID *id,
for (int j = 0; j < cdata->totlayer; j++) {
CustomDataLayer *layer = cdata->layers + j;
- if (!(CD_TYPE_AS_MASK(layer->type) & mask) ||
- (layer->flag & CD_FLAG_TEMPORARY)) {
+ if (!(CD_TYPE_AS_MASK(layer->type) & mask) || (layer->flag & CD_FLAG_TEMPORARY)) {
continue;
}
@@ -581,8 +580,7 @@ void BKE_id_attribute_subset_active_set(ID *id,
for (int j = 0; j < cdata->totlayer; j++) {
CustomDataLayer *layer_iter = cdata->layers + j;
- if (!(CD_TYPE_AS_MASK(layer_iter->type) & mask) ||
- (layer_iter->flag & CD_FLAG_TEMPORARY)) {
+ if (!(CD_TYPE_AS_MASK(layer_iter->type) & mask) || (layer_iter->flag & CD_FLAG_TEMPORARY)) {
continue;
}
diff --git a/source/blender/editors/interface/interface_layout.c b/source/blender/editors/interface/interface_layout.c
index 3e8bae6ea6b..c1bb2ed6d18 100644
--- a/source/blender/editors/interface/interface_layout.c
+++ b/source/blender/editors/interface/interface_layout.c
@@ -5705,8 +5705,7 @@ void uiLayoutSetTooltipFunc(uiLayout *layout,
UI_but_func_tooltip_set(bitem->but, func, arg, free_arg);
}
else {
- uiLayoutSetTooltipFunc(
- (uiLayout *)item, func, arg, copy_arg, free_arg);
+ uiLayoutSetTooltipFunc((uiLayout *)item, func, arg, copy_arg, free_arg);
}
}
diff --git a/source/blender/editors/mask/mask_ops.c b/source/blender/editors/mask/mask_ops.c
index d727c9f919b..3c0e7ee399c 100644
--- a/source/blender/editors/mask/mask_ops.c
+++ b/source/blender/editors/mask/mask_ops.c
@@ -272,14 +272,14 @@ static bool spline_under_mouse_get(const bContext *C,
}
for (MaskLayer *mask_layer_orig = mask_orig->masklayers.first,
- *mask_layer_eval = mask_eval->masklayers.first;
+ *mask_layer_eval = mask_eval->masklayers.first;
mask_layer_orig != NULL;
mask_layer_orig = mask_layer_orig->next, mask_layer_eval = mask_layer_eval->next) {
if (mask_layer_orig->visibility_flag & (MASK_HIDE_VIEW | MASK_HIDE_SELECT)) {
continue;
}
for (MaskSpline *spline_orig = mask_layer_orig->splines.first,
- *spline_eval = mask_layer_eval->splines.first;
+ *spline_eval = mask_layer_eval->splines.first;
spline_orig != NULL;
spline_orig = spline_orig->next, spline_eval = spline_eval->next) {
if ((spline_orig->flag & SELECT) == 0) {
diff --git a/source/blender/makesrna/intern/rna_camera.c b/source/blender/makesrna/intern/rna_camera.c
index 794f08d850e..f535cdcee96 100644
--- a/source/blender/makesrna/intern/rna_camera.c
+++ b/source/blender/makesrna/intern/rna_camera.c
@@ -564,7 +564,8 @@ void RNA_def_camera(BlenderRNA *brna)
RNA_def_property_float_sdna(prop, NULL, "lens");
RNA_def_property_range(prop, 1.0f, FLT_MAX);
RNA_def_property_ui_range(prop, 1.0f, 5000.0f, 100, 4);
- RNA_def_property_ui_text(prop, "Focal Length", "Perspective Camera focal length value in millimeters");
+ RNA_def_property_ui_text(
+ prop, "Focal Length", "Perspective Camera focal length value in millimeters");
RNA_def_property_update(prop, NC_OBJECT | ND_DRAW, "rna_Camera_update");
prop = RNA_def_property(srna, "sensor_width", PROP_FLOAT, PROP_DISTANCE_CAMERA);
diff --git a/source/blender/nodes/geometry/nodes/node_geo_set_material.cc b/source/blender/nodes/geometry/nodes/node_geo_set_material.cc
index 70063b3af19..296b40c6c49 100644
--- a/source/blender/nodes/geometry/nodes/node_geo_set_material.cc
+++ b/source/blender/nodes/geometry/nodes/node_geo_set_material.cc
@@ -5,11 +5,11 @@
#include "UI_interface.h"
#include "UI_resources.h"
+#include "DNA_curves_types.h"
#include "DNA_mesh_types.h"
#include "DNA_meshdata_types.h"
#include "DNA_pointcloud_types.h"
#include "DNA_volume_types.h"
-#include "DNA_curves_types.h"
#include "BKE_material.h"