main sync #3

Merged
Patrick Busch merged 318 commits from blender/blender:main into main 2023-03-17 15:52:21 +01:00
5 changed files with 15 additions and 12 deletions
Showing only changes of commit bc6985a6c1 - Show all commits

View File

@ -126,8 +126,8 @@ class GHOST_ContextVK : public GHOST_Context {
void *image, void *framebuffer, void *render_pass, void *extent, uint32_t *fb_id); void *image, void *framebuffer, void *render_pass, void *extent, uint32_t *fb_id);
/** /**
* Sets the swap interval for swapBuffers. * Sets the swap interval for `swapBuffers`.
* \param interval The swap interval to use. * \param interval: The swap interval to use.
* \return A boolean success indicator. * \return A boolean success indicator.
*/ */
GHOST_TSuccess setSwapInterval(int /* interval */) GHOST_TSuccess setSwapInterval(int /* interval */)
@ -137,7 +137,7 @@ class GHOST_ContextVK : public GHOST_Context {
/** /**
* Gets the current swap interval for swapBuffers. * Gets the current swap interval for swapBuffers.
* \param intervalOut Variable to store the swap interval if it can be read. * \param intervalOut: Variable to store the swap interval if it can be read.
* \return Whether the swap interval can be read. * \return Whether the swap interval can be read.
*/ */
GHOST_TSuccess getSwapInterval(int &) GHOST_TSuccess getSwapInterval(int &)

View File

@ -376,7 +376,7 @@ bool BKE_fcurve_calc_range(const struct FCurve *fcu,
/** /**
* Calculate the x and y extents of F-Curve's data. * Calculate the x and y extents of F-Curve's data.
* \param frame_range Only calculate the bounds of the FCurve in the given range. * \param frame_range: Only calculate the bounds of the FCurve in the given range.
* Does the full range if NULL. * Does the full range if NULL.
* \return true if the bounds have been found. * \return true if the bounds have been found.
*/ */

View File

@ -556,9 +556,12 @@ int BKE_fcurve_bezt_binarysearch_index(const BezTriple array[],
/* ...................................... */ /* ...................................... */
/* Get the first and last index to the bezt array that satisfies the given parameters. /**
* \param selected_keys_only Only accept indices of bezt that are selected. Is a subset of * Get the first and last index to the bezt array that satisfies the given parameters.
* frame_range. \param frame_range Only consider keyframes in that frame interval. Can be NULL. *
* \param selected_keys_only: Only accept indices of bezt that are selected.
* Is a subset of frame_range.
* \param frame_range: Only consider keyframes in that frame interval. Can be NULL.
*/ */
static bool get_bounding_bezt_indices(const FCurve *fcu, static bool get_bounding_bezt_indices(const FCurve *fcu,
const bool selected_keys_only, const bool selected_keys_only,

View File

@ -213,10 +213,10 @@ void paintface_reveal(bContext *C, Object *ob, const bool select)
} }
/** /**
* Join all edges of each poly in the AtomicDisjointSet. This can be used to find out which polys * Join all edges of each poly in the #AtomicDisjointSet. This can be used to find out which polys
* are connected to each other. * are connected to each other.
* \param islands Is expected to be of length mesh->totedge. * \param islands: Is expected to be of length `mesh->totedge`.
* \param skip_seams Polys separated by a seam will be treated as not connected. * \param skip_seams: Polys separated by a seam will be treated as not connected.
*/ */
static void build_poly_connections(blender::AtomicDisjointSet &islands, static void build_poly_connections(blender::AtomicDisjointSet &islands,
Mesh &mesh, Mesh &mesh,

View File

@ -145,10 +145,10 @@ void build_material_map(const Main *bmain, std::map<std::string, Material *> *r_
* Returns an existing Blender material that corresponds to the USD material with the given path. * Returns an existing Blender material that corresponds to the USD material with the given path.
* Returns null if no such material exists. * Returns null if no such material exists.
* *
* \param mat_map Map a material name to a Blender material. Note that the name key * \param mat_map: Map a material name to a Blender material. Note that the name key
* might be the Blender material name modified to be a valid USD identifier, * might be the Blender material name modified to be a valid USD identifier,
* to match the material names in the imported USD. * to match the material names in the imported USD.
* \param usd_path_to_mat_name Map a USD material path to the imported Blender material name. * \param usd_path_to_mat_name: Map a USD material path to the imported Blender material name.
* *
* The usd_path_to_mat_name is needed to determine the name of the Blender * The usd_path_to_mat_name is needed to determine the name of the Blender
* material imported from a USD path in the case when a unique name was generated * material imported from a USD path in the case when a unique name was generated