Cleanup: reformat trailing comments that caused line wrapping

4 files changed, 19 insertions, 15 deletions

diff --git a/intern/cycles/util/util_color.h b/intern/cycles/util/util_color.h
index 203c0b289f6..40c2c431aca 100644
--- a/intern/cycles/util/util_color.h
+++ b/intern/cycles/util/util_color.h
@@ -223,12 +223,14 @@ ccl_device_inline ssef fastpow24(const ssef &arg)
   ssef x = fastpow<0x3F4CCCCD, 0x4F55A7FB>(arg);  // error max = 0.17  avg = 0.0018    |avg| = 0.05
   ssef arg2 = arg * arg;
   ssef arg4 = arg2 * arg2;
-  x = improve_5throot_solution(x,
-                               arg4); /* error max = 0.018     avg = 0.0031    |avg| = 0.0031  */
-  x = improve_5throot_solution(x,
-                               arg4); /* error max = 0.00021   avg = 1.6e-05   |avg| = 1.6e-05 */
-  x = improve_5throot_solution(x,
-                               arg4); /* error max = 6.1e-07   avg = 5.2e-08   |avg| = 1.1e-07 */
+
+  /* error max = 0.018     avg = 0.0031    |avg| = 0.0031  */
+  x = improve_5throot_solution(x, arg4);
+  /* error max = 0.00021   avg = 1.6e-05   |avg| = 1.6e-05 */
+  x = improve_5throot_solution(x, arg4);
+  /* error max = 6.1e-07   avg = 5.2e-08   |avg| = 1.1e-07 */
+  x = improve_5throot_solution(x, arg4);
+
   return x * (x * x);
 }
 
diff --git a/intern/cycles/util/util_system.cpp b/intern/cycles/util/util_system.cpp
index 03bc5aea1dd..b010881058b 100644
--- a/intern/cycles/util/util_system.cpp
+++ b/intern/cycles/util/util_system.cpp
@@ -282,8 +282,8 @@ static CPUCapabilities &system_cpu_capabilities()
         /* actual opcode for xgetbv */
         __asm__(".byte 0x0f, 0x01, 0xd0" : "=a"(xcr_feature_mask), "=d"(edx) : "c"(0));
 #  elif defined(_MSC_VER) && defined(_XCR_XFEATURE_ENABLED_MASK)
-        xcr_feature_mask = (uint32_t)_xgetbv(
-            _XCR_XFEATURE_ENABLED_MASK); /* min VS2010 SP1 compiler is required */
+        /* Minimum VS2010 SP1 compiler is required. */
+        xcr_feature_mask = (uint32_t)_xgetbv(_XCR_XFEATURE_ENABLED_MASK);
 #  else
         xcr_feature_mask = 0;
 #  endif
diff --git a/intern/ghost/intern/GHOST_XrAction.cpp b/intern/ghost/intern/GHOST_XrAction.cpp
index 172ac40c84f..b10e001df47 100644
--- a/intern/ghost/intern/GHOST_XrAction.cpp
+++ b/intern/ghost/intern/GHOST_XrAction.cpp
@@ -392,9 +392,10 @@ GHOST_XrActionSet::GHOST_XrActionSet(XrInstance instance, const GHOST_XrActionSe
 {
   XrActionSetCreateInfo action_set_info{XR_TYPE_ACTION_SET_CREATE_INFO};
   strcpy(action_set_info.actionSetName, info.name);
-  strcpy(action_set_info.localizedActionSetName,
-         info.name); /* Just use same name for localized. This can be changed in the future if
-                        necessary. */
+
+  /* Just use same name for localized. This can be changed in the future if necessary. */
+  strcpy(action_set_info.localizedActionSetName, info.name);
+
   action_set_info.priority = 0; /* Use same (default) priority for all action sets. */
 
   CHECK_XR(xrCreateActionSet(instance, &action_set_info, &m_action_set),
diff --git a/intern/ghost/intern/GHOST_XrSession.h b/intern/ghost/intern/GHOST_XrSession.h
index d09c78e1ea7..a2d3cf2e385 100644
--- a/intern/ghost/intern/GHOST_XrSession.h
+++ b/intern/ghost/intern/GHOST_XrSession.h
@@ -74,10 +74,11 @@ class GHOST_XrSession {
                              const GHOST_XrActionProfileInfo *infos);
   bool attachActionSets();
 
-  /** Action functions to be called post-session start. */
-  bool syncActions(
-      const char *action_set_name = nullptr); /* If action_set_name is nullptr, all attached
-                                               * action sets will be synced. */
+  /**
+   * Action functions to be called post-session start.
+   * \param action_set_name: When `nullptr`, all attached action sets will be synced.
+   */
+  bool syncActions(const char *action_set_name = nullptr);
   bool applyHapticAction(const char *action_set_name,
                          const char *action_name,
                          const GHOST_TInt64 &duration,