From 1f4e59a96fb2254dfbc473e88bdce72beff6089b Mon Sep 17 00:00:00 2001
From: Harley Acheson <harley.acheson@gmail.com>
Date: Thu, 27 Jul 2023 13:12:52 -0700
Subject: [PATCH] Cleanup: Make format

Small format changes in various files (not just mine).
---
 intern/cycles/device/multi/device.cpp         |  2 +-
 .../blenfont/intern/blf_font_win32_compat.cc  |  2 +-
 source/blender/editors/space_nla/nla_ops.cc   | 20 ++++++++++---------
 source/blender/render/intern/texture_image.cc |  2 +-
 4 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/intern/cycles/device/multi/device.cpp b/intern/cycles/device/multi/device.cpp
index 0c103cd7f38..9fe03020a0b 100644
--- a/intern/cycles/device/multi/device.cpp
+++ b/intern/cycles/device/multi/device.cpp
@@ -220,7 +220,7 @@ class MultiDevice : public Device {
                                                                       BVH_LAYOUT_EMBREE;
         else if (bvh->params.bvh_layout == BVH_LAYOUT_MULTI_HIPRT_EMBREE)
           params.bvh_layout = sub.device->info.type == DEVICE_HIP ? BVH_LAYOUT_HIPRT :
-                                                                      BVH_LAYOUT_EMBREE;
+                                                                    BVH_LAYOUT_EMBREE;
         else if (bvh->params.bvh_layout == BVH_LAYOUT_MULTI_EMBREEGPU_EMBREE)
           params.bvh_layout = sub.device->info.type == DEVICE_ONEAPI ? BVH_LAYOUT_EMBREEGPU :
                                                                        BVH_LAYOUT_EMBREE;
diff --git a/source/blender/blenfont/intern/blf_font_win32_compat.cc b/source/blender/blenfont/intern/blf_font_win32_compat.cc
index 3fd96ff0170..d7150891d08 100644
--- a/source/blender/blenfont/intern/blf_font_win32_compat.cc
+++ b/source/blender/blenfont/intern/blf_font_win32_compat.cc
@@ -43,7 +43,7 @@ static void ft_ansi_stream_close(FT_Stream stream)
 
 static ulong ft_ansi_stream_io(FT_Stream stream, ulong offset, uchar *buffer, ulong count)
 {
-  
+
   if (!count && offset > stream->size) {
     return 1;
   }
diff --git a/source/blender/editors/space_nla/nla_ops.cc b/source/blender/editors/space_nla/nla_ops.cc
index 1775d79d9a0..9b383ad5dfc 100644
--- a/source/blender/editors/space_nla/nla_ops.cc
+++ b/source/blender/editors/space_nla/nla_ops.cc
@@ -146,19 +146,21 @@ void ED_operatormacros_nla()
   wmOperatorType *ot;
   wmOperatorTypeMacro *otmacro;
 
-  ot = WM_operatortype_append_macro("NLA_OT_duplicate_move",
-                                    "Duplicate",
-                                    "Duplicate selected NLA-Strips, adding the new strips to new track(s)",
-                                    OPTYPE_UNDO | OPTYPE_REGISTER);
+  ot = WM_operatortype_append_macro(
+      "NLA_OT_duplicate_move",
+      "Duplicate",
+      "Duplicate selected NLA-Strips, adding the new strips to new track(s)",
+      OPTYPE_UNDO | OPTYPE_REGISTER);
   otmacro = WM_operatortype_macro_define(ot, "NLA_OT_duplicate");
   RNA_boolean_set(otmacro->ptr, "linked", false);
   WM_operatortype_macro_define(ot, "TRANSFORM_OT_translate");
 
-  ot = WM_operatortype_append_macro("NLA_OT_duplicate_linked_move",
-                                    "Duplicate Linked",
-                                    "Duplicate Linked selected NLA-Strips, adding the new strips to new track(s)",
-                                    OPTYPE_UNDO | OPTYPE_REGISTER);
-                                    
+  ot = WM_operatortype_append_macro(
+      "NLA_OT_duplicate_linked_move",
+      "Duplicate Linked",
+      "Duplicate Linked selected NLA-Strips, adding the new strips to new track(s)",
+      OPTYPE_UNDO | OPTYPE_REGISTER);
+
   otmacro = WM_operatortype_macro_define(ot, "NLA_OT_duplicate");
   RNA_boolean_set(otmacro->ptr, "linked", true);
   WM_operatortype_macro_define(ot, "TRANSFORM_OT_translate");
diff --git a/source/blender/render/intern/texture_image.cc b/source/blender/render/intern/texture_image.cc
index 4b616c39904..bed0adb3c3f 100644
--- a/source/blender/render/intern/texture_image.cc
+++ b/source/blender/render/intern/texture_image.cc
@@ -6,11 +6,11 @@
  * \ingroup render
  */
 
-#include <fcntl.h>
 #include <cfloat>
 #include <cmath>
 #include <cstdio>
 #include <cstring>
+#include <fcntl.h>
 #ifndef WIN32
 #  include <unistd.h>
 #else