Commit: afc091c3c4bc86d4bb6165cbcdc9f17129d743e8
Author: Campbell Barton
Date: Tue Nov 1 12:24:06 2022 +1100
Branches: master
https://developer.blender.org/rBafc091c3c4bc86d4bb6165cbcdc9f17129d743e8
Cleanup: spelling in comments
===================================================================
M intern/cycles/blender/session.cpp
M intern/cycles/integrator/path_trace_work_gpu.cpp
M intern/ghost/intern/GHOST_SystemWayland.cpp
M source/blender/blenkernel/BKE_armature.h
M source/blender/blenkernel/BKE_key.h
M source/blender/blenkernel/BKE_pointcache.h
M source/blender/blenkernel/BKE_undo_system.h
M source/blender/blenkernel/intern/blendfile.c
M source/blender/blenkernel/intern/layer.c
M source/blender/blenkernel/intern/lib_id_delete.c
M source/blender/blenkernel/intern/mask_rasterize.c
M source/blender/blenkernel/intern/material.c
M source/blender/blenkernel/intern/pointcache.c
M source/blender/blenkernel/intern/screen.c
M source/blender/blenkernel/intern/softbody.c
M source/blender/blenkernel/intern/writeffmpeg.c
M source/blender/blenloader/intern/readfile.cc
M source/blender/bmesh/tools/bmesh_bevel.c
M source/blender/bmesh/tools/bmesh_wireframe.c
M source/blender/compositor/operations/COM_ConvertOperation.h
M source/blender/editors/armature/armature_utils.c
M source/blender/editors/armature/pose_transform.c
M source/blender/editors/interface/interface_handlers.c
M source/blender/editors/mesh/mesh_data.cc
M source/blender/editors/space_action/action_draw.c
M source/blender/editors/space_graph/graph_draw.c
M source/blender/editors/space_nla/nla_draw.c
M source/blender/editors/transform/transform_convert_armature.c
M source/blender/freestyle/intern/stroke/AdvancedFunctions1D.h
M source/blender/freestyle/intern/view_map/ViewMapTesselator.h
M source/blender/gpu/metal/mtl_shader_generator.hh
M source/blender/gpu/metal/mtl_texture_util.mm
M source/blender/makesdna/DNA_customdata_types.h
M source/blender/makesdna/DNA_layer_types.h
M source/blender/makesdna/DNA_meta_types.h
M source/blender/makesdna/DNA_modifier_types.h
M source/blender/makesdna/DNA_node_types.h
M source/blender/makesdna/DNA_particle_types.h
M source/blender/makesdna/DNA_space_types.h
M source/blender/makesdna/DNA_windowmanager_types.h
M source/blender/makesdna/DNA_workspace_types.h
M source/blender/makesrna/intern/rna_armature.c
M source/blender/makesrna/intern/rna_object.c
M source/blender/nodes/intern/node_exec.cc
M source/blender/nodes/intern/node_exec.h
M source/blender/nodes/shader/node_shader_tree.cc
M source/blender/nodes/texture/node_texture_tree.c
M source/blender/python/intern/bpy_rna.c
M source/blender/python/mathutils/mathutils_noise.c
M source/blender/render/intern/render_result.cc
M source/blender/windowmanager/WM_types.h
M source/blender/windowmanager/wm.h
===================================================================
diff --git a/intern/cycles/blender/session.cpp
b/intern/cycles/blender/session.cpp
index f9a83b2dc4b..6641e2b8ac5 100644
--- a/intern/cycles/blender/session.cpp
+++ b/intern/cycles/blender/session.cpp
@@ -497,9 +497,9 @@ void BlenderSession::render_frame_finish()
session->full_buffer_written_cb = function_null;
/* The display driver is the source of drawing context for both drawing and
possible graphics
- * interop objects in the path trace. Once the frame is finished the OpenGL
context might be
- * freed form Blender side. Need to ensure that all GPU resources are freed
prior to that
- * point.
+ * interoperability objects in the path trace. Once the frame is finished
the OpenGL context
+ * might be freed form Blender side. Need to ensure that all GPU resources
are freed prior to
+ * that point.
* Ideally would only do this when OpenGL context is actually destroyed, but
there is no way to
* know when this happens (at least in the code at the time when this
comment was written).
* The penalty of re-creating resources on every frame is unlikely to be
noticed. */
diff --git a/intern/cycles/integrator/path_trace_work_gpu.cpp
b/intern/cycles/integrator/path_trace_work_gpu.cpp
index 48f6cf3c903..547e8d50a22 100644
--- a/intern/cycles/integrator/path_trace_work_gpu.cpp
+++ b/intern/cycles/integrator/path_trace_work_gpu.cpp
@@ -100,8 +100,8 @@ void PathTraceWorkGPU::alloc_integrator_soa()
integrator_state_soa_volume_stack_size_ =
max(integrator_state_soa_volume_stack_size_,
requested_volume_stack_size);
- /* Deterine the number of path states. Deferring this for as long as
possible allows the backend
- * to make better decisions about memory availability. */
+ /* Determine the number of path states. Deferring this for as long as
possible allows the
+ * back-end to make better decisions about memory availability. */
if (max_num_paths_ == 0) {
size_t single_state_size = estimate_single_state_size(kernel_features);
diff --git a/intern/ghost/intern/GHOST_SystemWayland.cpp
b/intern/ghost/intern/GHOST_SystemWayland.cpp
index 3073a8fe80d..5af9f5a0231 100644
--- a/intern/ghost/intern/GHOST_SystemWayland.cpp
+++ b/intern/ghost/intern/GHOST_SystemWayland.cpp
@@ -801,7 +801,9 @@ struct GWL_Display {
/**
* Free the #GWL_Display and it's related members.
- * \note This may run on a partially initialized struct, so it can't be
assumed all mebers are set.
+ *
+ * \note This may run on a partially initialized struct,
+ * so it can't be assumed all members are set.
*/
static void gwl_display_destroy(GWL_Display *display)
{
diff --git a/source/blender/blenkernel/BKE_armature.h
b/source/blender/blenkernel/BKE_armature.h
index ee0f41937e2..eff05e471aa 100644
--- a/source/blender/blenkernel/BKE_armature.h
+++ b/source/blender/blenkernel/BKE_armature.h
@@ -34,9 +34,9 @@ typedef struct EditBone {
/** User-Defined Properties on this Bone */
struct IDProperty *prop;
/**
- * Editbones have a one-way link (i.e. children refer
+ * Edit-bones have a one-way link (i.e. children refer
* to parents. This is converted to a two-way link for
- * normal bones when leaving editmode.
+ * normal bones when leaving edit-mode.
*/
struct EditBone *parent;
/** (64 == MAXBONENAME) */
diff --git a/source/blender/blenkernel/BKE_key.h
b/source/blender/blenkernel/BKE_key.h
index 0fe351c0aa4..6cae56b775f 100644
--- a/source/blender/blenkernel/BKE_key.h
+++ b/source/blender/blenkernel/BKE_key.h
@@ -167,9 +167,9 @@ void BKE_keyblock_update_from_offset(const struct Object
*ob,
* Move shape key from org_index to new_index. Safe, clamps index to valid
range,
* updates reference keys, the object's active shape index,
* the 'frame' value in case of absolute keys, etc.
- * Note indices are expected in real values (not 'fake' shapenr +1 ones).
+ * Note indices are expected in real values (not *fake* `shapenr +1` ones).
*
- * \param org_index: if < 0, current object's active shape will be used as
skey to move.
+ * \param org_index: if < 0, current object's active shape will be used as
shape-key to move.
* \return true if something was done, else false.
*/
bool BKE_keyblock_move(struct Object *ob, int org_index, int new_index);
diff --git a/source/blender/blenkernel/BKE_pointcache.h
b/source/blender/blenkernel/BKE_pointcache.h
index efb8c2a9bb1..4331a25c112 100644
--- a/source/blender/blenkernel/BKE_pointcache.h
+++ b/source/blender/blenkernel/BKE_pointcache.h
@@ -293,6 +293,7 @@ void BKE_ptcache_ids_from_object(struct ListBase *lb,
bool BKE_ptcache_object_has(struct Scene *scene, struct Object *ob, int
duplis);
/************ ID specific functions ************************/
+
void BKE_ptcache_id_clear(PTCacheID *id, int mode, unsigned int cfra);
bool BKE_ptcache_id_exist(PTCacheID *id, int cfra);
int BKE_ptcache_id_reset(struct Scene *scene, PTCacheID *id, int mode);
diff --git a/source/blender/blenkernel/BKE_undo_system.h
b/source/blender/blenkernel/BKE_undo_system.h
index f3a929dc5b9..5d1a27f8ba0 100644
--- a/source/blender/blenkernel/BKE_undo_system.h
+++ b/source/blender/blenkernel/BKE_undo_system.h
@@ -75,7 +75,7 @@ typedef struct UndoStep {
/** Some situations require the global state to be stored, edge cases when
exiting modes. */
bool use_memfile_step;
/** When this is true, undo/memfile read code is allowed to re-use old
data-blocks for unchanged
- * IDs, and existing depsgraphes. This has to be forbidden in some cases
(like renamed IDs). */
+ * IDs, and existing depsgraphs. This has to be forbidden in some cases
(like renamed IDs). */
bool use_old_bmain_data;
/** For use by undo systems that accumulate changes (mesh-sculpt &
image-painting). */
bool is_applied;
diff --git a/source/blender/blenkernel/intern/blendfile.c
b/source/blender/blenkernel/intern/blendfile.c
index 85a43b7c479..8b0d3f2e92e 100644
--- a/source/blender/blenkernel/intern/blendfile.c
+++ b/source/blender/blenkernel/intern/blendfile.c
@@ -186,7 +186,7 @@ static void setup_app_data(bContext *C,
clean_paths(bfd->main);
}
- /* XXX here the complex windowmanager matching */
+ /* The following code blocks performs complex window-manager matching. */
/* no load screens? */
if (mode != LOAD_UI) {
diff --git a/source/blender/blenkernel/intern/layer.c
b/source/blender/blenkernel/intern/layer.c
index 06d69b6ff61..5b54f16661c 100644
--- a/source/blender/blenkernel/intern/layer.c
+++ b/source/blender/blenkernel/intern/layer.c
@@ -614,7 +614,7 @@ static bool layer_collection_hidden(ViewLayer *view_layer,
LayerCollection *lc)
return true;
}
- /* Check visiblilty restriction flags */
+ /* Check visibility restriction flags */
if (lc->flag & LAYER_COLLECTION_HIDE || lc->collection->flag &
COLLECTION_HIDE_VIEWPORT) {
return true;
}
diff --git a/source/blender/blenkernel/intern/lib_id_delete.c
b/source/blender/blenkernel/intern/lib_id_delete.c
index 1a80376f482..c7643c56212 100644
--- a/source/blender/blenkernel/intern/lib_id_delete.c
+++ b/source/blender/blenkernel/intern/lib_id_delete.c
@@ -293,14 +293,14 @@ static size_t id_delete(Main *bmain, const bool
do_tagged_deletion)
* is never affected). */
for (ID *id = tagged_deleted_ids.first; id; id = id->next) {
id->tag |= LIB_TAG_NO_MAIN;
- /* Usercount needs to be reset artificially, since some usages may not
be cleared in batch
+ /* User-count needs to be reset artificially, since some usages may not
be cleared in batch
* deletion (typically, if one deleted ID uses another deleted ID, this
may not be cleared by
* remapping code, depending on order in which these are handled). */
id->us = ID_FAKE_USERS(id);
}
}
else {
- /* First tag all datablocks directly from target lib.
+ /* First tag all data-blocks directly from target lib.
* Note that we go forward here, since we want to check dependencies
before users
* (e.g. meshes before objects).
* Avoids to have to loop twice. */
diff --git a/source/blender/blenkernel/intern/mask_rasterize.c
b/source/blender/blenkernel/intern/mask_rasterize.c
index 55834d5cf4e..adc0eb5f78c 100644
--- a/source/blender/blenkernel/intern/mask_rasterize.c
+++ b/source/blender/blenkernel/intern/mask_rasterize.c
@@ -521,7 +521,7 @@ static void layer_bucket_init(MaskRasterLayer *layer, const
float pixel_size)
}
if (1) {
- /* now convert linknodes into arrays for faster per pixel access */
+ /* Now convert link-nodes into arrays for faster per pixel access. */
uint **buckets_face = MEM_mallocN(bucket_tot * sizeof(*buckets_face),
__func__);
uint bucket_index;
@@ -1186,7 +1186,7 @@ void BKE_maskrasterize_handle_init(MaskRasterHandle
*mr_handle,
// printf("tris %d, feather tris %d\n", sf_tri_tot, tot_feather_quads);
}
- /* add trianges */
+ /* Add triangles. */
BLI_scanfill_end_arena(&sf_ctx, sf_arena);
}
diff --git a/source/blender/blenkernel/intern/material.c
b/source/blender/blenkernel/intern/material.c
index 51e27f173c8..59530a6d6a6 100644
--- a/source/blender/blenkernel/intern/material.c
+++ b/source/blender/blenkernel/intern/material.c
@@ -1450,7 +1450,7 @@ static bool fill_texpaint_slots_cb(bNode *node, void
*userdata)
NodeTexImage *storage = (NodeTexImage *)node->storage;
slot->interp = storage->interpolation;
slot->image_user = &storage->iuser;
- /* for new renderer, we need to traverse the treeback in search of a UV
node */
+ /* For new renderer, we need to traverse the tree back in search of a UV
node. */
bNode *uvnode = nodetree_uv_node_recursive(node);
if (uvnode) {
@@ -1561,7 +1561,7 @@ void BKE_texpaint_slot_refresh_cache(Scene *scene,
Material *ma, const struct Ob
}
/* COW needed when adding texture slot on an object with no materials.
- * But do it only when slots actually change to avoid continuous depsgrap
updates. */
+ * But do it only when slots actually change to avoid continuous depsgraph
updates. */
if (ma->tot_slots != prev_tot_slots || ma->paint_active_slot !=
prev_paint_active_slot ||
ma->paint_clone_slot != prev_
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
List details, subscription details or unsubscribe:
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
