blender
/
blender
136
406
Fork 589
Code Issues 6.2k Pull Requests 749 Projects 19 Wiki Activity

Cleanup: clang-format

This commit is contained in:
Campbell Barton 2019-05-06 11:59:03 +10:00
parent 90f8f5cb06
commit 0ddec50944
4 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
intern/cycles/util/util_math.h
View File

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

3
source/blender/editors/mesh/editmesh_bevel.c
View File

@ -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 */

4
source/blender/editors/object/object_constraint.c
View File

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

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

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