blender
/
blender
136
406
Fork 587
Code Issues 6.2k Pull Requests 756 Projects 19 Wiki Activity

Cleanup: clang-format

This commit is contained in:
Lukas Stockner 2022-04-11 23:49:37 +02:00
parent 484a914647
commit 3c62e539af
5 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
source/blender/blenkernel/intern/attribute.c
View File

@ -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;
}

3
source/blender/editors/interface/interface_layout.c
View File

@ -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);
}
}

4
source/blender/editors/mask/mask_ops.c
View File

@ -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) {

3
source/blender/makesrna/intern/rna_camera.c
View File

@ -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);

2
source/blender/nodes/geometry/nodes/node_geo_set_material.cc
View File

@ -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"