[Bf-blender-cvs] [9cb061f4f01] master: Cleanup: spelling in comments
Campbell Barton
noreply at git.blender.org
Mon Dec 5 03:05:41 CET 2022
Commit: 9cb061f4f0119e647173e7d354e1457e97632333
Author: Campbell Barton
Date: Mon Dec 5 12:58:18 2022 +1100
Branches: master
https://developer.blender.org/rB9cb061f4f0119e647173e7d354e1457e97632333
Cleanup: spelling in comments
===================================================================
M intern/cycles/blender/display_driver.cpp
M intern/cycles/blender/display_driver.h
M intern/cycles/kernel/integrator/shade_background.h
M intern/cycles/kernel/light/sample.h
M intern/cycles/kernel/types.h
M intern/ghost/GHOST_C-api.h
M intern/ghost/intern/GHOST_ContextVK.cpp
M source/blender/blenkernel/intern/movieclip.c
M source/blender/blenkernel/intern/pbvh_uv_islands.cc
M source/blender/blenkernel/tracking_private.h
M source/blender/blenlib/intern/BLI_ghash_utils.c
M source/blender/compositor/intern/COM_Converter.h
M source/blender/draw/intern/mesh_extractors/extract_mesh_vbo_attributes.cc
M source/blender/editors/sculpt_paint/paint_image_proj.cc
M source/blender/editors/sculpt_paint/sculpt_automasking.cc
M source/blender/editors/space_clip/tracking_ops_intern.h
M source/blender/editors/space_clip/tracking_select.c
M source/blender/editors/transform/transform_mode_shear.c
M source/blender/gpu/intern/gpu_texture.cc
M source/blender/gpu/metal/mtl_state.hh
M source/blender/gpu/metal/mtl_texture.mm
M source/blender/makesdna/DNA_tracking_types.h
M source/blender/nodes/geometry/nodes/node_geo_edge_split.cc
M source/blender/nodes/geometry/nodes/node_geo_subdivision_surface.cc
M source/blender/python/bmesh/bmesh_py_types_meshdata.c
M source/blender/python/intern/bpy_app_translations.c
M source/blender/render/intern/multires_bake.cc
M source/blender/sequencer/intern/strip_transform.c
===================================================================
diff --git a/intern/cycles/blender/display_driver.cpp b/intern/cycles/blender/display_driver.cpp
index 7149592ad83..dd5b2f01d5b 100644
--- a/intern/cycles/blender/display_driver.cpp
+++ b/intern/cycles/blender/display_driver.cpp
@@ -803,7 +803,7 @@ void BlenderDisplayDriver::draw(const Params ¶ms)
const int position_attribute = GPU_vertformat_attr_add(
format, display_shader_->position_attribute_name, GPU_COMP_F32, 2, GPU_FETCH_FLOAT);
- /* Note: Shader is bound again through IMM to register this shader with the imm module
+ /* Note: Shader is bound again through IMM to register this shader with the IMM module
* and perform required setup for IMM rendering. This is required as the IMM module
* needs to be aware of which shader is bound, and the main display shader
* is bound externally. */
diff --git a/intern/cycles/blender/display_driver.h b/intern/cycles/blender/display_driver.h
index 16a5ee681e8..6a7178180ce 100644
--- a/intern/cycles/blender/display_driver.h
+++ b/intern/cycles/blender/display_driver.h
@@ -126,7 +126,7 @@ class BlenderDisplayDriver : public DisplayDriver {
void gpu_context_lock();
void gpu_context_unlock();
- /* Create GPU resources used by the dispaly driver. */
+ /* Create GPU resources used by the display driver. */
bool gpu_resources_create();
/* Destroy all GPU resources which are being used by this object. */
diff --git a/intern/cycles/kernel/integrator/shade_background.h b/intern/cycles/kernel/integrator/shade_background.h
index 81fc7a46a0c..a3dec6a7c74 100644
--- a/intern/cycles/kernel/integrator/shade_background.h
+++ b/intern/cycles/kernel/integrator/shade_background.h
@@ -113,7 +113,7 @@ ccl_device_inline void integrate_background(KernelGlobals kg,
/* Background MIS weights. */
float mis_weight = 1.0f;
- /* Check if background light exists or if we should skip pdf. */
+ /* Check if background light exists or if we should skip PDF. */
if (!(INTEGRATOR_STATE(state, path, flag) & PATH_RAY_MIS_SKIP) &&
kernel_data.background.use_mis) {
mis_weight = light_sample_mis_weight_forward_background(kg, state, path_flag);
diff --git a/intern/cycles/kernel/light/sample.h b/intern/cycles/kernel/light/sample.h
index 2dfd26bc680..ae6c14489a4 100644
--- a/intern/cycles/kernel/light/sample.h
+++ b/intern/cycles/kernel/light/sample.h
@@ -401,7 +401,7 @@ ccl_device_inline float light_sample_mis_weight_forward_surface(KernelGlobals kg
float pdf = triangle_light_pdf(kg, sd, t);
/* Light selection pdf. */
- /* Handled in triangle_light_pdf for effeciency. */
+ /* Handled in triangle_light_pdf for efficiency. */
return light_sample_mis_weight_forward(kg, bsdf_pdf, pdf);
}
diff --git a/intern/cycles/kernel/types.h b/intern/cycles/kernel/types.h
index eb1dbdcca93..93b15e3af9a 100644
--- a/intern/cycles/kernel/types.h
+++ b/intern/cycles/kernel/types.h
@@ -226,7 +226,7 @@ enum PathRayFlag : uint32_t {
*/
/* Surface had transmission component at previous bounce. Used for light tree
- * traversal and culling to be consistent with MIS pdf at the next bounce. */
+ * traversal and culling to be consistent with MIS PDF at the next bounce. */
PATH_RAY_MIS_HAD_TRANSMISSION = (1U << 10U),
/* Don't apply multiple importance sampling weights to emission from
diff --git a/intern/ghost/GHOST_C-api.h b/intern/ghost/GHOST_C-api.h
index 3aac4ac960b..5c113a7e328 100644
--- a/intern/ghost/GHOST_C-api.h
+++ b/intern/ghost/GHOST_C-api.h
@@ -1195,7 +1195,7 @@ int GHOST_XrGetControllerModelData(GHOST_XrContextHandle xr_context,
#ifdef WITH_VULKAN_BACKEND
/**
- * Return vulkan handles for the given context.
+ * Return VULKAN handles for the given context.
*/
void GHOST_GetVulkanHandles(GHOST_ContextHandle context,
void *r_instance,
@@ -1204,7 +1204,7 @@ void GHOST_GetVulkanHandles(GHOST_ContextHandle context,
uint32_t *r_graphic_queue_familly);
/**
- * Return vulkan backbuffer resources handles for the given window.
+ * Return VULKAN back-buffer resources handles for the given window.
*/
void GHOST_GetVulkanBackbuffer(GHOST_WindowHandle windowhandle,
void *image,
diff --git a/intern/ghost/intern/GHOST_ContextVK.cpp b/intern/ghost/intern/GHOST_ContextVK.cpp
index e446d9057a7..4ec045ccee2 100644
--- a/intern/ghost/intern/GHOST_ContextVK.cpp
+++ b/intern/ghost/intern/GHOST_ContextVK.cpp
@@ -100,7 +100,7 @@ static const char *vulkan_error_as_string(VkResult result)
printf(__VA_ARGS__); \
}
-/* Tripple buffering. */
+/* Triple buffering. */
const int MAX_FRAMES_IN_FLIGHT = 2;
GHOST_ContextVK::GHOST_ContextVK(bool stereoVisual,
@@ -220,7 +220,7 @@ GHOST_TSuccess GHOST_ContextVK::swapBuffers()
&m_currentImage);
if (result == VK_ERROR_OUT_OF_DATE_KHR || result == VK_SUBOPTIMAL_KHR) {
- /* Swapchain is out of date. Recreate swapchain and skip this frame. */
+ /* Swap-chain is out of date. Recreate swap-chain and skip this frame. */
destroySwapchain();
createSwapchain();
return GHOST_kSuccess;
@@ -271,7 +271,7 @@ GHOST_TSuccess GHOST_ContextVK::swapBuffers()
result = vkQueuePresentKHR(m_present_queue, &present_info);
if (result == VK_ERROR_OUT_OF_DATE_KHR || result == VK_SUBOPTIMAL_KHR) {
- /* Swapchain is out of date. Recreate swapchain and skip this frame. */
+ /* Swap-chain is out of date. Recreate swap-chain and skip this frame. */
destroySwapchain();
createSwapchain();
return GHOST_kSuccess;
@@ -932,7 +932,7 @@ GHOST_TSuccess GHOST_ContextVK::initializeDrawingContext()
present_queue_create_info.queueCount = 1;
present_queue_create_info.pQueuePriorities = queue_priorities;
- /* Eash queue must be unique. */
+ /* Each queue must be unique. */
if (m_queue_family_graphic != m_queue_family_present) {
queue_create_infos.push_back(present_queue_create_info);
}
diff --git a/source/blender/blenkernel/intern/movieclip.c b/source/blender/blenkernel/intern/movieclip.c
index 6ea537f9038..010dd4a01bf 100644
--- a/source/blender/blenkernel/intern/movieclip.c
+++ b/source/blender/blenkernel/intern/movieclip.c
@@ -242,8 +242,8 @@ static void movieclip_blend_write(BlendWriter *writer, ID *id, const void *id_ad
LISTBASE_FOREACH (MovieTrackingObject *, object, &tracking->objects) {
#if USE_LEGACY_CAMERA_OBJECT_FORMAT_ON_SAVE
- /* When saving camers object in the legacy format clear the list of tracks. This is because the
- * tracking object code is generic and assumes object owns the tracks in the list. For the
+ /* When saving cameras object in the legacy format clear the list of tracks. This is because
+ * the tracking object code is generic and assumes object owns the tracks in the list. For the
* camera tracks that is not the case in the legacy format. */
if (!is_undo && (object->flag & TRACKING_OBJECT_CAMERA)) {
MovieTrackingObject legacy_object = *object;
diff --git a/source/blender/blenkernel/intern/pbvh_uv_islands.cc b/source/blender/blenkernel/intern/pbvh_uv_islands.cc
index 7ef403b8c47..ac864d4d32d 100644
--- a/source/blender/blenkernel/intern/pbvh_uv_islands.cc
+++ b/source/blender/blenkernel/intern/pbvh_uv_islands.cc
@@ -499,7 +499,7 @@ static std::optional<UVBorderCorner> sharpest_border_corner(UVIsland &island)
/** The inner edge of a fan. */
struct InnerEdge {
MeshPrimitive *primitive;
- /* UVs order are already applied. So uvs[0] mathes primitive->vertices[vert_order[0]]/ */
+ /* UVs order are already applied. So `uvs[0]` matches `primitive->vertices[vert_order[0]]`. */
float2 uvs[3];
int vert_order[3];
@@ -1198,7 +1198,7 @@ UVBorder UVPrimitive::extract_border() const
{
Vector<UVBorderEdge> border_edges;
for (UVEdge *edge : edges) {
- /* TODO remove const cast. only needed for debugging atm. */
+ /* TODO remove const cast. only needed for debugging ATM. */
UVBorderEdge border_edge(edge, const_cast<UVPrimitive *>(this));
border_edges.append(border_edge);
}
diff --git a/source/blender/blenkernel/tracking_private.h b/source/blender/blenkernel/tracking_private.h
index f92f2ec9e2d..76af80d0e84 100644
--- a/source/blender/blenkernel/tracking_private.h
+++ b/source/blender/blenkernel/tracking_private.h
@@ -83,11 +83,11 @@ void tracking_set_marker_coords_from_tracking(int frame_width,
* Convert the lens principal point (optical center) between normalized and pixel spaces.
*
* The normalized space stores principal point relative to the frame center which has normalized
- * princibal coordinate of (0, 0). The right top corder of the frame corresponds to a notmalized
- * principal coordinate of (1, 1), and the left bottom cornder corresponds to coordinate of
+ * principal coordinate of (0, 0). The right top corner of the frame corresponds to a normalized
+ * principal coordinate of (1, 1), and the left bottom corner corresponds to coordinate of
* (-1, -1).
*
- * The pixel space is measured in pixels, with the reference being the left bottom cornder of
+ * The pixel space is measured in pixels, with the reference being the left bottom corner of
* the frame.
*/
void tracking_principal_point_normalized_to_pixel(const float principal_point_normalized[2],
diff --git a/source/blender/blenlib/intern/BLI_ghash_utils.c b/source/blender/blenlib/intern/BLI_ghash_utils.c
index 806d58df260..87508cc5918 100644
--- a/source/blender/blenlib/intern/BLI_ghash_utils.c
+++ b/source/blender/blenlib/intern/BLI_ghash_utils.c
@@ -36,9 +36,9 @@ uint BLI_ghashutil_ptrhash(const void *key)
size_t y = (size_t)key;
/* bottom 3 or 4 bits are likely to be 0; rotate y by 4 to avoid
- * excessive hash collisions for dicts and sets */
+ * excessive hash collisions for dictionaries and sets */
- /* NOTE: Unlike Python 'sizeof(uint)' is used instead of 'sizeof(void *)',
+ /* NOTE: Unlike Python `sizeof(uint)` is used instead of `sizeof(void *)`,
* Otherwise casting to 'uint' ignores the upper bits on 64bit platforms. */
return (uint)(y >> 4) | ((uint)y << (sizeof(uint[8]) - 4));
}
diff --git a/source/blender/compositor/intern/COM_Conv
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list