[Bf-blender-cvs] [41c7c744eb5] master: Cleanup: use C-style comments, add missing doxy section

Campbell Barton noreply at git.blender.org
Thu Jun 9 13:34:12 CEST 2022


Commit: 41c7c744eb530e7f67ba0edd718765f12029684c
Author: Campbell Barton
Date:   Thu Jun 9 21:31:08 2022 +1000
Branches: master
https://developer.blender.org/rB41c7c744eb530e7f67ba0edd718765f12029684c

Cleanup: use C-style comments, add missing doxy section

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

M	intern/ghost/intern/GHOST_SystemWayland.cpp
M	source/blender/draw/engines/overlay/shaders/overlay_point_varying_color_frag.glsl
M	source/blender/gpu/shaders/gpu_shader_point_varying_color_frag.glsl
M	source/blender/io/wavefront_obj/tests/obj_importer_tests.cc

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

diff --git a/intern/ghost/intern/GHOST_SystemWayland.cpp b/intern/ghost/intern/GHOST_SystemWayland.cpp
index 6dc32e8fae3..816c5f9c614 100644
--- a/intern/ghost/intern/GHOST_SystemWayland.cpp
+++ b/intern/ghost/intern/GHOST_SystemWayland.cpp
@@ -71,7 +71,7 @@ struct cursor_t {
   struct wl_cursor_theme *theme = nullptr;
   int size;
   std::string theme_name;
-  // outputs on which the cursor is visible
+  /** Outputs on which the cursor is visible. */
   std::unordered_set<const output_t *> outputs;
   int scale = 1;
 };
@@ -121,11 +121,11 @@ struct input_t {
   struct xkb_context *xkb_context;
   struct xkb_state *xkb_state;
   struct {
-    /* Key repetition in character per second. */
+    /** Key repetition in character per second. */
     int32_t rate;
-    /* Time (milliseconds) after which to start repeating keys. */
+    /** Time (milliseconds) after which to start repeating keys. */
     int32_t delay;
-    /* Timer for key repeats. */
+    /** Timer for key repeats. */
     GHOST_ITimerTask *timer = nullptr;
   } key_repeat;
 
@@ -133,8 +133,10 @@ struct input_t {
   struct wl_surface *focus_keyboard = nullptr;
 
   struct wl_data_device *data_device = nullptr;
-  struct data_offer_t *data_offer_dnd;        /* Drag & Drop. */
-  struct data_offer_t *data_offer_copy_paste; /* Copy & Paste. */
+  /** Drag & Drop. */
+  struct data_offer_t *data_offer_dnd;
+  /** Copy & Paste. */
+  struct data_offer_t *data_offer_copy_paste;
 
   struct data_source_t *data_source;
 };
@@ -828,7 +830,7 @@ static const struct wl_data_device_listener data_device_listener = {
 /** \} */
 
 /* -------------------------------------------------------------------- */
-/** \name Listener (Pointer), #wl_pointer_listener
+/** \name Listener (Surface), #wl_surface_listener
  * \{ */
 
 static void cursor_buffer_release(void *data, struct wl_buffer *wl_buffer)
@@ -911,6 +913,12 @@ struct wl_surface_listener cursor_surface_listener = {
     cursor_surface_leave,
 };
 
+/** \} */
+
+/* -------------------------------------------------------------------- */
+/** \name Listener (Pointer), #wl_pointer_listener
+ * \{ */
+
 static void pointer_enter(void *data,
                           struct wl_pointer * /*wl_pointer*/,
                           uint32_t serial,
diff --git a/source/blender/draw/engines/overlay/shaders/overlay_point_varying_color_frag.glsl b/source/blender/draw/engines/overlay/shaders/overlay_point_varying_color_frag.glsl
index 4962fb01c88..b0da035ef09 100644
--- a/source/blender/draw/engines/overlay/shaders/overlay_point_varying_color_frag.glsl
+++ b/source/blender/draw/engines/overlay/shaders/overlay_point_varying_color_frag.glsl
@@ -5,7 +5,7 @@ void main()
   float dist_squared = dot(centered, centered);
   const float rad_squared = 0.25;
 
-  // round point with jaggy edges
+  /* Round point with jaggy edges. */
   if (dist_squared > rad_squared) {
     discard;
   }
diff --git a/source/blender/gpu/shaders/gpu_shader_point_varying_color_frag.glsl b/source/blender/gpu/shaders/gpu_shader_point_varying_color_frag.glsl
index 4962fb01c88..b0da035ef09 100644
--- a/source/blender/gpu/shaders/gpu_shader_point_varying_color_frag.glsl
+++ b/source/blender/gpu/shaders/gpu_shader_point_varying_color_frag.glsl
@@ -5,7 +5,7 @@ void main()
   float dist_squared = dot(centered, centered);
   const float rad_squared = 0.25;
 
-  // round point with jaggy edges
+  /* Round point with jaggy edges. */
   if (dist_squared > rad_squared) {
     discard;
   }
diff --git a/source/blender/io/wavefront_obj/tests/obj_importer_tests.cc b/source/blender/io/wavefront_obj/tests/obj_importer_tests.cc
index 235e9ac77e6..6d09f522028 100644
--- a/source/blender/io/wavefront_obj/tests/obj_importer_tests.cc
+++ b/source/blender/io/wavefront_obj/tests/obj_importer_tests.cc
@@ -111,7 +111,7 @@ class obj_importer_test : public BlendfileLoadingBaseTest {
         int endpoint = (nurb->flagu & CU_NURB_ENDPOINT) ? 1 : 0;
         EXPECT_EQ(nurb->orderu, exp.mesh_totpoly_or_curve_order);
         EXPECT_EQ(endpoint, exp.mesh_totedge_or_curve_endp);
-        // Cyclic flag is not set by the importer yet
+        /* Cyclic flag is not set by the importer yet. */
         // int cyclic = (nurb->flagu & CU_NURB_CYCLIC) ? 1 : 0;
         // EXPECT_EQ(cyclic, exp.mesh_totloop_or_curve_cyclic);
       }



More information about the Bf-blender-cvs mailing list