[Bf-blender-cvs] [047ebfc3831] cycles_path_guiding: Fix Arm build error

[Brecht Van Lommel]

Commit: 047ebfc38319f92deb428462c655263448e020cc
Author: Brecht Van Lommel
Date:   Thu Sep 15 19:42:48 2022 +0200
Branches: cycles_path_guiding
https://developer.blender.org/rB047ebfc38319f92deb428462c655263448e020cc

Fix Arm build error

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

M	intern/cycles/device/cpu/device_impl.cpp

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

diff --git a/intern/cycles/device/cpu/device_impl.cpp b/intern/cycles/device/cpu/device_impl.cpp
index dc2dd51fa74..ee5e06d2e09 100644
--- a/intern/cycles/device/cpu/device_impl.cpp
+++ b/intern/cycles/device/cpu/device_impl.cpp
@@ -299,38 +299,38 @@ void *CPUDevice::get_guiding_device() const
     else {
       guiding_device = nullptr;
     }
-  }
 #  endif
-    return guiding_device.get();
+  }
+  return guiding_device.get();
 #else
   return nullptr;
 #endif
-  }
+}
 
-  void CPUDevice::get_cpu_kernel_thread_globals(vector<CPUKernelThreadGlobals> &
-                                                kernel_thread_globals)
-  {
-    /* Ensure latest texture info is loaded into kernel globals before returning. */
-    load_texture_info();
-    kernel_thread_globals.clear();
-    void *osl_memory = get_cpu_osl_memory();
-    for (int i = 0; i < info.cpu_threads; i++) {
-      kernel_thread_globals.emplace_back(kernel_globals, osl_memory, profiler);
-    }
+void CPUDevice::get_cpu_kernel_thread_globals(
+    vector<CPUKernelThreadGlobals> &kernel_thread_globals)
+{
+  /* Ensure latest texture info is loaded into kernel globals before returning. */
+  load_texture_info();
+  kernel_thread_globals.clear();
+  void *osl_memory = get_cpu_osl_memory();
+  for (int i = 0; i < info.cpu_threads; i++) {
+    kernel_thread_globals.emplace_back(kernel_globals, osl_memory, profiler);
   }
+}
 
-  void *CPUDevice::get_cpu_osl_memory()
-  {
+void *CPUDevice::get_cpu_osl_memory()
+{
 #ifdef WITH_OSL
-    return &osl_globals;
+  return &osl_globals;
 #else
   return NULL;
 #endif
-  }
+}
 
-  bool CPUDevice::load_kernels(const uint /*kernel_features*/)
-  {
-    return true;
-  }
+bool CPUDevice::load_kernels(const uint /*kernel_features*/)
+{
+  return true;
+}
 
-  CCL_NAMESPACE_END
+CCL_NAMESPACE_END