diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2019-05-06 04:59:03 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2019-05-06 04:59:03 +0300 |
| commit | 0ddec5094463596d14c43a855a77f5578064a5cf (patch) | |
| tree | 4a8321dec82536c972d5e98f6b90169ab5d8e8b1 | |
| parent | 90f8f5cb06efc3255257b1fcb0811dfab76cc146 (diff) | |
Cleanup: clang-format
| -rw-r--r-- | intern/cycles/util/util_math.h | 3 | ||||
| -rw-r--r-- | source/blender/editors/mesh/editmesh_bevel.c | 3 | ||||
| -rw-r--r-- | source/blender/editors/object/object_constraint.c | 4 | ||||
| -rw-r--r-- | source/blender/makesrna/intern/rna_scene.c | 3 |
4 files changed, 8 insertions, 5 deletions
diff --git a/intern/cycles/util/util_math.h b/intern/cycles/util/util_math.h index 40c5ebbab67..dde0d31f467 100644 --- a/intern/cycles/util/util_math.h +++ b/intern/cycles/util/util_math.h @@ -654,7 +654,8 @@ ccl_device_inline float2 map_to_sphere(const float3 co) /* Compares two floats. * Returns true if their absolute difference is smaller than abs_diff (for numbers near zero) * or their relative difference is less than ulp_diff ULPs. - * Based on https://randomascii.wordpress.com/2012/02/25/comparing-floating-point-numbers-2012-edition/ + * Based on + * https://randomascii.wordpress.com/2012/02/25/comparing-floating-point-numbers-2012-edition/ */ ccl_device_inline float compare_floats(float a, float b, float abs_diff, int ulp_diff) diff --git a/source/blender/editors/mesh/editmesh_bevel.c b/source/blender/editors/mesh/editmesh_bevel.c index f5810d9ff61..1cd4e95314b 100644 --- a/source/blender/editors/mesh/editmesh_bevel.c +++ b/source/blender/editors/mesh/editmesh_bevel.c @@ -907,7 +907,8 @@ void MESH_OT_bevel(wmOperatorType *ot) /* identifiers */ ot->name = "Bevel"; - ot->description = "Cut into selected items at an angle to create flat or rounded bevel or chamfer"; + ot->description = + "Cut into selected items at an angle to create flat or rounded bevel or chamfer"; ot->idname = "MESH_OT_bevel"; /* api callbacks */ diff --git a/source/blender/editors/object/object_constraint.c b/source/blender/editors/object/object_constraint.c index 078135f46ff..abdf64af595 100644 --- a/source/blender/editors/object/object_constraint.c +++ b/source/blender/editors/object/object_constraint.c @@ -2025,8 +2025,8 @@ static const EnumPropertyItem *object_constraint_add_itemf(bContext *UNUSED(C), EnumPropertyItem *object_constraint_items = NULL; int totitem = 0; - while(item->identifier) { - if((item->value != CONSTRAINT_TYPE_KINEMATIC) && (item->value != CONSTRAINT_TYPE_SPLINEIK)) { + while (item->identifier) { + if ((item->value != CONSTRAINT_TYPE_KINEMATIC) && (item->value != CONSTRAINT_TYPE_SPLINEIK)) { RNA_enum_item_add(&object_constraint_items, &totitem, item); } item++; diff --git a/source/blender/makesrna/intern/rna_scene.c b/source/blender/makesrna/intern/rna_scene.c index 3bfba5c56e7..a6ff09ea4d0 100644 --- a/source/blender/makesrna/intern/rna_scene.c +++ b/source/blender/makesrna/intern/rna_scene.c @@ -3568,7 +3568,8 @@ static void rna_def_unit_settings(BlenderRNA *brna) /* Units */ prop = RNA_def_property(srna, "system", PROP_ENUM, PROP_NONE); RNA_def_property_enum_items(prop, unit_systems); - RNA_def_property_ui_text(prop, "Unit System", "The unit system to use for user interface controls"); + RNA_def_property_ui_text( + prop, "Unit System", "The unit system to use for user interface controls"); RNA_def_property_update(prop, NC_WINDOW, "rna_UnitSettings_system_update"); prop = RNA_def_property(srna, "system_rotation", PROP_ENUM, PROP_NONE); |