[Bf-blender-cvs] [bfeb64d6204] master: Cleanup: make format

Brecht Van Lommel noreply at git.blender.org
Wed Oct 5 21:41:32 CEST 2022


Commit: bfeb64d62047008f145a5e347bead34995e6be81
Author: Brecht Van Lommel
Date:   Wed Oct 5 20:24:37 2022 +0200
Branches: master
https://developer.blender.org/rBbfeb64d62047008f145a5e347bead34995e6be81

Cleanup: make format

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

M	source/blender/draw/intern/draw_manager_data.cc
M	source/blender/editors/space_sequencer/sequencer_draw.c
M	source/blender/editors/space_sequencer/sequencer_thumbnails.c
M	source/blender/editors/transform/transform_snap_sequencer.c
M	source/blender/modifiers/intern/MOD_solidify.c

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

diff --git a/source/blender/draw/intern/draw_manager_data.cc b/source/blender/draw/intern/draw_manager_data.cc
index 0974f5d14b1..6741d25bcdf 100644
--- a/source/blender/draw/intern/draw_manager_data.cc
+++ b/source/blender/draw/intern/draw_manager_data.cc
@@ -695,7 +695,7 @@ static void drw_call_obinfos_init(DRWObjectInfos *ob_infos, Object *ob)
   drw_call_calc_orco(ob, ob_infos->orcotexfac);
   /* Random float value. */
   uint random = (DST.dupli_source) ?
-                    DST.dupli_source->random_id :
+                     DST.dupli_source->random_id :
                      /* TODO(fclem): this is rather costly to do at runtime. Maybe we can
                       * put it in ob->runtime and make depsgraph ensure it is up to date. */
                      BLI_hash_int_2d(BLI_hash_string(ob->id.name + 2), 0);
diff --git a/source/blender/editors/space_sequencer/sequencer_draw.c b/source/blender/editors/space_sequencer/sequencer_draw.c
index 6ebc3e95b70..77255c965a7 100644
--- a/source/blender/editors/space_sequencer/sequencer_draw.c
+++ b/source/blender/editors/space_sequencer/sequencer_draw.c
@@ -1316,7 +1316,7 @@ static void draw_seq_strip(const bContext *C,
                                                     SEQ_time_left_handle_frame_get(scene, seq);
   y1 = seq->machine + SEQ_STRIP_OFSBOTTOM;
   x2 = SEQ_time_has_right_still_frames(scene, seq) ? SEQ_time_content_end_frame_get(scene, seq) :
-           SEQ_time_right_handle_frame_get(scene, seq);
+                                                     SEQ_time_right_handle_frame_get(scene, seq);
   y2 = seq->machine + SEQ_STRIP_OFSTOP;
 
   /* Limit body to strip bounds. Meta strip can end up with content outside of strip range. */
@@ -2287,8 +2287,7 @@ static void draw_seq_strips(const bContext *C, Editing *ed, ARegion *region)
         continue;
       }
       if (max_ii(SEQ_time_right_handle_frame_get(scene, seq),
-                 SEQ_time_content_end_frame_get(scene, seq)) <
-          v2d->cur.xmin) {
+                 SEQ_time_content_end_frame_get(scene, seq)) < v2d->cur.xmin) {
         continue;
       }
       if (seq->machine + 1.0f < v2d->cur.ymin) {
diff --git a/source/blender/editors/space_sequencer/sequencer_thumbnails.c b/source/blender/editors/space_sequencer/sequencer_thumbnails.c
index 36f2aa87d9d..460054f3b44 100644
--- a/source/blender/editors/space_sequencer/sequencer_thumbnails.c
+++ b/source/blender/editors/space_sequencer/sequencer_thumbnails.c
@@ -78,8 +78,8 @@ static bool check_seq_need_thumbnails(const Scene *scene, Sequence *seq, rctf *v
       view_area->xmax) {
     return false;
   }
-  if (max_ii(SEQ_time_right_handle_frame_get(scene, seq), SEQ_time_content_end_frame_get(scene, seq)) <
-      view_area->xmin) {
+  if (max_ii(SEQ_time_right_handle_frame_get(scene, seq),
+             SEQ_time_content_end_frame_get(scene, seq)) < view_area->xmin) {
     return false;
   }
   if (seq->machine + 1.0f < view_area->ymin) {
diff --git a/source/blender/editors/transform/transform_snap_sequencer.c b/source/blender/editors/transform/transform_snap_sequencer.c
index ed8b201240b..10a51750ed3 100644
--- a/source/blender/editors/transform/transform_snap_sequencer.c
+++ b/source/blender/editors/transform/transform_snap_sequencer.c
@@ -204,9 +204,9 @@ static void seq_snap_target_points_build(Scene *scene,
 
     if (snap_mode & SEQ_SNAP_TO_STRIP_HOLD) {
       int content_start = min_ii(SEQ_time_left_handle_frame_get(scene, seq),
-                                       SEQ_time_start_frame_get(seq));
+                                 SEQ_time_start_frame_get(seq));
       int content_end = max_ii(SEQ_time_right_handle_frame_get(scene, seq),
-                                     SEQ_time_content_end_frame_get(scene, seq));
+                               SEQ_time_content_end_frame_get(scene, seq));
       /* Effects and single image strips produce incorrect content length. Skip these strips. */
       if ((seq->type & SEQ_TYPE_EFFECT) != 0 || seq->len == 1) {
         content_start = SEQ_time_left_handle_frame_get(scene, seq);
diff --git a/source/blender/modifiers/intern/MOD_solidify.c b/source/blender/modifiers/intern/MOD_solidify.c
index 2da9c1e214e..1c1649a5ed8 100644
--- a/source/blender/modifiers/intern/MOD_solidify.c
+++ b/source/blender/modifiers/intern/MOD_solidify.c
@@ -162,7 +162,8 @@ static void materials_panel_draw(const bContext *UNUSED(C), Panel *panel)
   uiItemR(layout, ptr, "material_offset", 0, NULL, ICON_NONE);
   col = uiLayoutColumn(layout, true);
   uiLayoutSetActive(col, RNA_boolean_get(ptr, "use_rim"));
-  uiItemR(col, ptr, "material_offset_rim", 0, CTX_IFACE_(BLT_I18NCONTEXT_ID_MESH, "Rim"), ICON_NONE);
+  uiItemR(
+      col, ptr, "material_offset_rim", 0, CTX_IFACE_(BLT_I18NCONTEXT_ID_MESH, "Rim"), ICON_NONE);
 }
 
 static void edge_data_panel_draw(const bContext *UNUSED(C), Panel *panel)
@@ -216,7 +217,13 @@ static void vertex_group_panel_draw(const bContext *UNUSED(C), Panel *panel)
   col = uiLayoutColumn(layout, false);
   uiItemPointerR(
       col, ptr, "shell_vertex_group", &ob_ptr, "vertex_groups", IFACE_("Shell"), ICON_NONE);
-  uiItemPointerR(col, ptr, "rim_vertex_group", &ob_ptr, "vertex_groups", CTX_IFACE_(BLT_I18NCONTEXT_ID_MESH, "Rim"), ICON_NONE);
+  uiItemPointerR(col,
+                 ptr,
+                 "rim_vertex_group",
+                 &ob_ptr,
+                 "vertex_groups",
+                 CTX_IFACE_(BLT_I18NCONTEXT_ID_MESH, "Rim"),
+                 ICON_NONE);
 }
 
 static void panelRegister(ARegionType *region_type)



More information about the Bf-blender-cvs mailing list