[Bf-blender-cvs] [3021f9b48c3] master: Cleanup: Clang format
Aaron Carlisle
noreply at git.blender.org
Mon Jul 19 23:12:14 CEST 2021
Commit: 3021f9b48c325a6b930da0442f86d89398665fa0
Author: Aaron Carlisle
Date: Mon Jul 19 17:12:01 2021 -0400
Branches: master
https://developer.blender.org/rB3021f9b48c325a6b930da0442f86d89398665fa0
Cleanup: Clang format
===================================================================
M source/blender/blenlib/BLI_delaunay_2d.h
M source/blender/compositor/operations/COM_SMAAOperation.cc
M source/blender/editors/armature/pose_lib.c
M source/blender/editors/space_action/action_select.c
M source/blender/simulation/intern/SIM_mass_spring.cpp
===================================================================
diff --git a/source/blender/blenlib/BLI_delaunay_2d.h b/source/blender/blenlib/BLI_delaunay_2d.h
index 5a8ddfb5a92..d8876b1b79a 100644
--- a/source/blender/blenlib/BLI_delaunay_2d.h
+++ b/source/blender/blenlib/BLI_delaunay_2d.h
@@ -110,7 +110,7 @@ extern "C" {
* If zero is supplied for epsilon, an internal value of 1e-8 used
* instead, since this code will not work correctly if it is not allowed
* to merge "too near" vertices.
- *
+ *
* Normally the output will contain mappings from outputs to inputs.
* If this is not needed, set need_ids to false and the execution may be much
* faster in some circumstances.
diff --git a/source/blender/compositor/operations/COM_SMAAOperation.cc b/source/blender/compositor/operations/COM_SMAAOperation.cc
index 3c753591ced..b078d85372d 100644
--- a/source/blender/compositor/operations/COM_SMAAOperation.cc
+++ b/source/blender/compositor/operations/COM_SMAAOperation.cc
@@ -19,9 +19,9 @@
*/
#include "COM_SMAAOperation.h"
+#include "BKE_node.h"
#include "BLI_math.h"
#include "COM_SMAAAreaTexture.h"
-#include "BKE_node.h"
extern "C" {
#include "IMB_colormanagement.h"
diff --git a/source/blender/editors/armature/pose_lib.c b/source/blender/editors/armature/pose_lib.c
index b727e1c176d..cb70b2810d1 100644
--- a/source/blender/editors/armature/pose_lib.c
+++ b/source/blender/editors/armature/pose_lib.c
@@ -62,8 +62,8 @@
#include "ED_anim_api.h"
#include "ED_armature.h"
-#include "ED_keyframes_keylist.h"
#include "ED_keyframes_edit.h"
+#include "ED_keyframes_keylist.h"
#include "ED_keyframing.h"
#include "ED_object.h"
#include "ED_screen.h"
diff --git a/source/blender/editors/space_action/action_select.c b/source/blender/editors/space_action/action_select.c
index 677053ff577..59d2063ea84 100644
--- a/source/blender/editors/space_action/action_select.c
+++ b/source/blender/editors/space_action/action_select.c
@@ -51,8 +51,8 @@
#include "ED_anim_api.h"
#include "ED_gpencil.h"
-#include "ED_keyframes_keylist.h"
#include "ED_keyframes_edit.h"
+#include "ED_keyframes_keylist.h"
#include "ED_markers.h"
#include "ED_mask.h"
#include "ED_screen.h"
diff --git a/source/blender/simulation/intern/SIM_mass_spring.cpp b/source/blender/simulation/intern/SIM_mass_spring.cpp
index ca01120eecb..b79731ab330 100644
--- a/source/blender/simulation/intern/SIM_mass_spring.cpp
+++ b/source/blender/simulation/intern/SIM_mass_spring.cpp
@@ -213,7 +213,8 @@ int SIM_cloth_solver_init(Object *UNUSED(ob), ClothModifierData *clmd)
return 1;
}
-void SIM_mass_spring_set_implicit_vertex_mass(Implicit_Data *data, int index, float mass){
+void SIM_mass_spring_set_implicit_vertex_mass(Implicit_Data *data, int index, float mass)
+{
SIM_mass_spring_set_vertex_mass(data, index, mass);
}
More information about the Bf-blender-cvs
mailing list