[Bf-blender-cvs] [200cc531bd2] master: Cleanup: Missing clang format in previous commit

Pablo Dobarro noreply at git.blender.org
Fri Apr 3 19:23:29 CEST 2020


Commit: 200cc531bd2b66f886c1399da0f48f99619d39a5
Author: Pablo Dobarro
Date:   Fri Apr 3 19:23:05 2020 +0200
Branches: master
https://developer.blender.org/rB200cc531bd2b66f886c1399da0f48f99619d39a5

Cleanup: Missing clang format in previous commit

===================================================================

M	source/blender/editors/sculpt_paint/sculpt.c
M	source/blender/editors/sculpt_paint/sculpt_face_set.c
M	source/blender/editors/sculpt_paint/sculpt_intern.h

===================================================================

diff --git a/source/blender/editors/sculpt_paint/sculpt.c b/source/blender/editors/sculpt_paint/sculpt.c
index 490ec336ccc..a981e722b1c 100644
--- a/source/blender/editors/sculpt_paint/sculpt.c
+++ b/source/blender/editors/sculpt_paint/sculpt.c
@@ -3676,7 +3676,6 @@ static void do_draw_brush(Sculpt *sd, Object *ob, PBVHNode **nodes, int totnode)
   BKE_pbvh_parallel_range(0, totnode, &data, do_draw_brush_task_cb_ex, &settings);
 }
 
-
 static void do_draw_sharp_brush_task_cb_ex(void *__restrict userdata,
                                            const int n,
                                            const TaskParallelTLS *__restrict tls)
@@ -11110,7 +11109,6 @@ static void SCULPT_OT_set_pivot_position(wmOperatorType *ot)
                 10000.0f);
 }
 
-
 void ED_operatortypes_sculpt(void)
 {
   WM_operatortype_append(SCULPT_OT_brush_stroke);
diff --git a/source/blender/editors/sculpt_paint/sculpt_face_set.c b/source/blender/editors/sculpt_paint/sculpt_face_set.c
index a1bf2f7d7bd..1dd1fcf721d 100644
--- a/source/blender/editors/sculpt_paint/sculpt_face_set.c
+++ b/source/blender/editors/sculpt_paint/sculpt_face_set.c
@@ -24,8 +24,8 @@
 #include "MEM_guardedalloc.h"
 
 #include "BLI_blenlib.h"
-#include "BLI_math.h"
 #include "BLI_hash.h"
+#include "BLI_math.h"
 #include "BLI_task.h"
 
 #include "DNA_brush_types.h"
@@ -223,7 +223,6 @@ void SCULPT_do_draw_face_sets_brush(Sculpt *sd, Object *ob, PBVHNode **nodes, in
   }
 }
 
-
 /* Face Sets Operators */
 
 typedef enum eSculptFaceGroupsCreateModes {
diff --git a/source/blender/editors/sculpt_paint/sculpt_intern.h b/source/blender/editors/sculpt_paint/sculpt_intern.h
index ba14c9ff011..7f926054ca7 100644
--- a/source/blender/editors/sculpt_paint/sculpt_intern.h
+++ b/source/blender/editors/sculpt_paint/sculpt_intern.h
@@ -154,7 +154,6 @@ bool SCULPT_vertex_any_face_set_visible_get(SculptSession *ss, int index);
 void SCULPT_face_sets_visibility_invert(SculptSession *ss);
 void SCULPT_face_sets_visibility_all_set(SculptSession *ss, bool visible);
 
-
 /* Sculpt Original Data */
 typedef struct {
   struct BMLog *bm_log;
@@ -306,9 +305,6 @@ void SCULPT_relax_vertex(struct SculptSession *ss,
                          bool filter_boundary_face_sets,
                          float *r_final_pos);
 
-
-
-
 /* Undo */
 
 typedef enum {
@@ -760,7 +756,6 @@ bool SCULPT_get_redraw_rect(struct ARegion *region,
                             Object *ob,
                             rcti *rect);
 
-
 /* Operators */
 
 /* Face Sets */
@@ -769,5 +764,4 @@ void SCULPT_OT_face_sets_change_visibility(struct wmOperatorType *ot);
 void SCULPT_OT_face_sets_init(struct wmOperatorType *ot);
 void SCULPT_OT_face_sets_create(struct wmOperatorType *ot);
 
-
 #endif



More information about the Bf-blender-cvs mailing list