Merge branch 'blender-v4.0-release'

intern/ghost/intern/GHOST_SystemCocoa.mm

@@ -473,7 +473,7 @@ extern "C" int GHOST_HACK_getFirstFile(char buf[FIRSTFILEBUFLG])
 
   if (![closing_window isKeyWindow]) {
     /* If the window wasn't key then its either none of the windows are key or another window
-     * is a key. The former situation is a bit strange, but probably forcin a key window is not
+     * is a key. The former situation is a bit strange, but probably forcing a key window is not
      * something desirable. The latter situation is when we definitely do not want to change the
      * key window.
      *

source/blender/blenkernel/intern/lib_override.cc

@@ -1575,12 +1575,12 @@ static ID *lib_override_root_find(Main *bmain, ID *id, const int curr_level, int
   }
 
   if (entry->tags & MAINIDRELATIONS_ENTRY_TAGS_INPROGRESS) {
-    /* Re-processing an entry already being processed higher in the callgraph (re-entry caused by a
-     * dependency loops). Just do nothing, there is no more usefull info to provide here. */
+    /* Re-processing an entry already being processed higher in the call-graph (re-entry caused by
+     * a dependency loops). Just do nothing, there is no more useful info to provide here. */
     return nullptr;
   }
   /* Flag this entry to avoid re-processing it in case some dependency loop leads to it again
-   * downwards in the callstack. */
+   * downwards in the call-stack. */
   entry->tags |= MAINIDRELATIONS_ENTRY_TAGS_INPROGRESS;
 
   int best_level_candidate = curr_level;

source/blender/editors/include/UI_interface_c.hh

@@ -118,17 +118,21 @@ struct uiViewItemHandle;
 
 /** #uiBlock.emboss and #uiBut.emboss */
 enum eUIEmbossType {
-  UI_EMBOSS = 0,          /* use widget style for drawing */
-  UI_EMBOSS_NONE = 1,     /* Nothing, only icon and/or text */
-  UI_EMBOSS_PULLDOWN = 2, /* Pull-down menu style */
-  UI_EMBOSS_RADIAL = 3,   /* Pie Menu */
+  /** Use widget style for drawing. */
+  UI_EMBOSS = 0,
+  /** Nothing, only icon and/or text */
+  UI_EMBOSS_NONE = 1,
+  /** Pull-down menu style */
+  UI_EMBOSS_PULLDOWN = 2,
+  /** Pie Menu */
+  UI_EMBOSS_RADIAL = 3,
   /**
    * The same as #UI_EMBOSS_NONE, unless the button has
    * a coloring status like an animation state or red alert.
    */
   UI_EMBOSS_NONE_OR_STATUS = 4,
-
-  UI_EMBOSS_UNDEFINED = 255, /* For layout engine, use emboss from block. */
+  /** For layout engine, use emboss from block. */
+  UI_EMBOSS_UNDEFINED = 255,
 };
 
 /** #uiBlock::direction */
@@ -2834,7 +2838,11 @@ void uiItemPointerR(uiLayout *layout,
                     const char *name,
                     int icon);
 
-/* Create a list of enum items. Active is an optional item to highlight. */
+/**
+* Create a list of enum items.
+
+ * \param active: an optional item to highlight.
+*/
 void uiItemsFullEnumO(uiLayout *layout,
                       const char *opname,
                       const char *propname,
@@ -2846,7 +2854,7 @@ void uiItemsFullEnumO(uiLayout *layout,
  * Create UI items for enum items in \a item_array.
  *
  * A version of #uiItemsFullEnumO that takes pre-calculated item array.
- * active, if not -1, will highlight that item.
+ * \param active: if not -1, will highlight that item.
  */
 void uiItemsFullEnumO_items(uiLayout *layout,
                             wmOperatorType *ot,

source/blender/gpu/intern/gpu_viewport.cc

@@ -159,7 +159,7 @@ static void gpu_viewport_textures_create(GPUViewport *viewport)
     }
   }
 
-  /* Can be shared with GPUOffscreen. */
+  /* Can be shared with #GPUOffscreen. */
   if (viewport->depth_tx == nullptr) {
     /* Depth texture can be read back by gizmos #view3d_depths_create. */
     /* Swizzle flag is needed by Workbench Volumes to read the stencil view. */