archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Cleanup: spelling

Browse Source
This commit is contained in:
Campbell Barton
2020-09-10 09:45:25 +10:00
parent 0721fbb6e1
commit 5badf16531
18 changed files with 47 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
intern/cycles/render/svm.h
View File

@@ -87,9 +87,7 @@ class SVMCompiler {
/* Total time spent on all routines. */
double time_total;
/* A full multiline description of the state of the compiler after
* compilation.
*/
/* A full multi-line description of the state of the compiler after compilation. */
string full_report() const;
};

2
intern/cycles/util/util_task.h
View File

@@ -47,7 +47,7 @@ class TaskPool {
/* Number of all tasks handled by this pool. */
int num_tasks_handled;
/* A full multiline description of the state of the pool after
/* A full multi-line description of the state of the pool after
* all work is done.
*/
string full_report() const;

2
source/blender/blenkernel/intern/layer.c
View File

@@ -1248,7 +1248,7 @@ void BKE_layer_collection_local_sync(ViewLayer *view_layer, const View3D *v3d)
}
/**
* Sync the local collection for all the viewports.
* Sync the local collection for all the view-ports.
*/
void BKE_layer_collection_local_sync_all(const Main *bmain)
{

14
source/blender/blenkernel/intern/nla.c
View File

@@ -1284,12 +1284,11 @@ static void nlastrip_fix_resize_overlaps(NlaStrip *strip)
nls->start = strip->end;
}
else {
/* shrink transition down to 1 frame long (so that it can still be found),
* then offset everything else by the remaining defict to give the strip room
*/
/* Shrink transition down to 1 frame long (so that it can still be found),
* then offset everything else by the remaining deficit to give the strip room. */
nls->start = nls->end - 1.0f;
/* XXX: review whether preventing fractionals is good here... */
/* XXX: review whether preventing fractional values is good here... */
offset = ceilf(strip->end - nls->start);
/* apply necessary offset to ensure that the strip has enough space */
@@ -1333,12 +1332,11 @@ static void nlastrip_fix_resize_overlaps(NlaStrip *strip)
nls->end = strip->start;
}
else {
/* shrink transition down to 1 frame long (so that it can still be found),
* then offset everything else by the remaining defict to give the strip room
*/
/* Shrink transition down to 1 frame long (so that it can still be found),
* then offset everything else by the remaining deficit to give the strip room. */
nls->end = nls->start + 1.0f;
/* XXX: review whether preventing fractionals is good here... */
/* XXX: review whether preventing fractional values is good here... */
offset = ceilf(nls->end - strip->start);
/* apply necessary offset to ensure that the strip has enough space */

31
source/blender/blenkernel/intern/sequencer.c
View File

@@ -1529,20 +1529,17 @@ static int evaluate_seq_frame_gen(Sequence **seq_arr, ListBase *seqbase, int cfr
/* Drop strips which are used for effect inputs, we don't want
* them to blend into render stack in any other way than effect
* string rendering.
*/
* string rendering. */
for (LinkNode *seq_item = effect_inputs.list; seq_item; seq_item = seq_item->next) {
Sequence *seq = seq_item->link;
/* It's possible that effetc strip would be placed to the same
/* It's possible that effect strip would be placed to the same
* 'machine' as it's inputs. We don't want to clear such strips
* from the stack.
*/
* from the stack. */
if (seq_arr[seq->machine] && seq_arr[seq->machine]->type & SEQ_TYPE_EFFECT) {
continue;
}
/* If we're shown a specified channel, then we want to see the stirps
* which belongs to this machine.
*/
/* If we're shown a specified channel, then we want to see the strips
* which belongs to this machine. */
if (chanshown != 0 && chanshown <= seq->machine) {
continue;
}
@@ -1776,7 +1773,7 @@ static void seq_open_anim_file(Scene *scene, Sequence *seq, bool openfile)
seq->strip->colorspace_settings.name);
}
/* no individual view files - monoscopic, stereo 3d or exr multiview */
/* No individual view files - monoscopic, stereo 3d or EXR multi-view. */
totfiles = 1;
}
@@ -1829,7 +1826,7 @@ static bool seq_proxy_get_custom_file_fname(Sequence *seq, char *name, const int
if (view_id > 0) {
BLI_snprintf(suffix, sizeof(suffix), "_%d", view_id);
/* TODO(sergey): This will actually append suffix after extension
* which is weird but how was originally coded in multiview branch.
* which is weird but how was originally coded in multi-view branch.
*/
BLI_snprintf(name, PROXY_MAXFILE, "%s_%s", fname, suffix);
}
@@ -1855,7 +1852,7 @@ static bool seq_proxy_get_fname(Editing *ed,
return false;
}
/* Multiview suffix. */
/* Multi-view suffix. */
if (view_id > 0) {
BLI_snprintf(suffix, sizeof(suffix), "_%d", view_id);
}
@@ -2566,7 +2563,9 @@ static void *color_balance_do_thread(void *thread_data_v)
return NULL;
}
/* cfra is offset by fra_offset only in case we are using a real mask. */
/**
* \a cfra is offset by \a fra_offset only in case we are using a real mask.
*/
ImBuf *BKE_sequencer_render_mask_input(const SeqRenderData *context,
int mask_input_type,
Sequence *mask_sequence,
@@ -2968,7 +2967,7 @@ static ImBuf *seq_render_effect_strip_impl(const SeqRenderData *context,
break;
case EARLY_DO_EFFECT:
for (i = 0; i < 3; i++) {
/* Speed effect requires time remapping of cfra for input(s). */
/* Speed effect requires time remapping of `cfra` for input(s). */
if (input[0] && seq->type == SEQ_TYPE_SPEED) {
float target_frame = BKE_sequencer_speed_effect_target_frame_get(context, seq, cfra, i);
ibuf[i] = seq_render_strip(context, state, input[0], target_frame);
@@ -3013,7 +3012,9 @@ static ImBuf *seq_render_effect_strip_impl(const SeqRenderData *context,
return out;
}
/* Render individual view for multiview or single (default view) for monoview. */
/**
* Render individual view for multi-view or single (default view) for mono-view.
*/
static ImBuf *seq_render_image_strip_view(const SeqRenderData *context,
Sequence *seq,
char *name,
@@ -3048,7 +3049,7 @@ static ImBuf *seq_render_image_strip_view(const SeqRenderData *context,
imb_freerectImBuf(ibuf);
}
/* All sequencer color is done in SRGB space, linear gives odd crossfades. */
/* All sequencer color is done in SRGB space, linear gives odd cross-fades. */
BKE_sequencer_imbuf_to_sequencer_space(context->scene, ibuf, false);
return ibuf;

2
source/blender/blenkernel/intern/softbody.c
View File

@@ -211,7 +211,7 @@ static float sb_time_scale(Object *ob)
* will cause unwanted responses of the softbody system (which does inter frame calculations )
* so first 'cure' would be: interpolate linear in time ..
* Q: why do i write this?
* A: because it happened once, that some eger coder 'streamlined' code to fail.
* A: because it happened once, that some eager coder 'streamlined' code to fail.
* We DO linear interpolation for goals .. and i think we should do on animated properties as well
*/

8
source/blender/blenlib/intern/string_search.cc
View File

@@ -108,7 +108,7 @@ int damerau_levenshtein_distance(StringRef a, StringRef b)
*/
int get_fuzzy_match_errors(StringRef query, StringRef full)
{
/* If it is a perfect partial match, return immediatly. */
/* If it is a perfect partial match, return immediately. */
if (full.find(query) != StringRef::not_found) {
return 0;
}
@@ -180,8 +180,8 @@ int get_fuzzy_match_errors(StringRef query, StringRef full)
* So "bose" does not match "select boundary". However, individual words can be skipped. For
* example, "rocc" matches "rotate edge ccw".
*
* Returns true when the match was successfull. If it was successfull, the used words are tagged in
* r_word_is_matched.
* \return true when the match was successful.
* If it was successful, the used words are tagged in \a r_word_is_matched.
*/
static bool match_word_initials(StringRef query,
Span<StringRef> words,
@@ -384,7 +384,7 @@ void extract_normalized_words(StringRef str,
}
offset += size;
}
/* If the last word is not followed by a separator, it has to be handld separately. */
/* If the last word is not followed by a separator, it has to be handled separately. */
if (is_in_word) {
r_words.append(str_copy.drop_prefix(static_cast<int>(word_start)));
}

6
source/blender/bmesh/operators/bmo_bisect_plane.c
View File

@@ -65,9 +65,9 @@ void bmo_bisect_plane_exec(BMesh *bm, BMOperator *op)
BM_mesh_bisect_plane(bm, plane, use_snap_center, true, ELE_CUT, ELE_NEW, dist);
if (clear_outer || clear_inner) {
/* Use an array of vertices because 'geom' contains both vers and edges that may use them.
* Removing a vert may remove and edge which is later checked by BMO_ITER.
* over-alloc the total possible vert count */
/* Use an array of vertices because 'geom' contains both verts and edges that may use them.
* Removing a vert may remove and edge which is later checked by #BMO_ITER.
* over-allocate the total possible vert count. */
const int vert_arr_max = min_ii(bm->totvert, BMO_slot_buffer_count(op->slots_in, "geom"));
BMVert **vert_arr = MEM_mallocN(sizeof(*vert_arr) * (size_t)vert_arr_max, __func__);
BMOIter siter;

2
source/blender/compositor/operations/COM_BokehImageOperation.h
View File

@@ -29,7 +29,7 @@
* - angle offset of the flaps
* - rounding of the flaps (also used to make a circular lens)
* - simulate catadioptric
* - simulate lensshift
* - simulate lens-shift
*
* Per pixel the algorithm determines the edge of the bokeh on the same line as the center of the
*image and the pixel is evaluating.

2
source/blender/depsgraph/intern/depsgraph_physics.cc
View File

@@ -80,7 +80,7 @@ ListBase *DEG_get_effector_relations(const Depsgraph *graph, Collection *collect
if (hash == nullptr) {
return nullptr;
}
/* Note: nullptr is a valid loolup key here as it means that the relation is not bound to a
/* Note: nullptr is a valid lookup key here as it means that the relation is not bound to a
* specific collection. */
ID *collection_orig = DEG_get_original_id(object_id_safe(collection));
return hash->lookup_default(collection_orig, nullptr);

2
source/blender/draw/engines/basic/basic_engine.c
View File

@@ -46,7 +46,7 @@ extern char datatoc_common_view_lib_glsl[];
/* *********** LISTS *********** */
/* GPUViewport.storage
* Is freed everytime the viewport engine changes */
* Is freed every time the viewport engine changes. */
typedef struct BASIC_StorageList {
struct BASIC_PrivateData *g_data;
} BASIC_StorageList;

2
source/blender/draw/engines/eevee/shaders/closure_lib.glsl
View File

@@ -36,7 +36,7 @@ struct Closure {
Closure nodetree_exec(void);
/* clang-format off */
/* Avoid multiline defines. */
/* Avoid multi-line defines. */
#ifdef VOLUMETRICS
# define CLOSURE_DEFAULT Closure(vec3(0), vec3(0), vec3(0), 0.0)
#elif !defined(USE_SSS)

2
source/blender/draw/engines/external/external_engine.c vendored
View File

@@ -52,7 +52,7 @@ extern char datatoc_common_view_lib_glsl[];
/* *********** LISTS *********** */
/* GPUViewport.storage
* Is freed everytime the viewport engine changes */
* Is freed every time the viewport engine changes. */
typedef struct EXTERNAL_Storage {
int dummy;
} EXTERNAL_Storage;

2
source/blender/editors/gpencil/gpencil_sculpt_paint.c
View File

@@ -1105,7 +1105,7 @@ static bool gpencil_sculpt_brush_apply_clone(bContext *C, tGP_BrushEditData *gso
gpencil_brush_clone_adjust(gso);
}
else {
/* Continuous - Just keep pasting everytime we move */
/* Continuous - Just keep pasting every time we move. */
/* TODO: The spacing of repeat should be controlled using a
* "stepsize" or similar property? */
gpencil_brush_clone_add(C, gso);

11
source/blender/editors/uvedit/uvedit_parametrizer.c
View File

@@ -1231,17 +1231,16 @@ static PFace *p_face_add_fill(PChart *chart, PVert *v1, PVert *v2, PVert *v3)
static PBool p_quad_split_direction(PHandle *handle, float **co, PHashKey *vkeys)
{
/* slight bias to prefer one edge over the other in case they are equal, so
/* Slight bias to prefer one edge over the other in case they are equal, so
* that in symmetric models we choose the same split direction instead of
* depending on floating point errors to decide */
* depending on floating point errors to decide. */
float bias = 1.0f + 1e-6f;
float fac = len_v3v3(co[0], co[2]) * bias - len_v3v3(co[1], co[3]);
PBool dir = (fac <= 0.0f);
/* the face exists check is there because of a special case: when
* two quads share three vertices, they can each be split into two
* triangles, resulting in two identical triangles. for example in
* suzanne's nose. */
/* The face exists check is there because of a special case:
* when two quads share three vertices, they can each be split into two triangles,
* resulting in two identical triangles. For example in Suzanne's nose. */
if (dir) {
if (p_face_exists(handle, vkeys, 0, 1, 2) || p_face_exists(handle, vkeys, 0, 2, 3)) {
return !dir;

2
source/blender/makesrna/intern/rna_rna.c
View File

@@ -1852,7 +1852,7 @@ int rna_property_override_diff_default(Main *bmain,
if (is_first_insert) {
/* We need to clean up all possible existing insertion operations,
* otherwise we'd end up with a mess of ops everytime something changes. */
* otherwise we'd end up with a mess of ops every time something changes. */
for (IDOverrideLibraryPropertyOperation *opop = op->operations.first;
opop != NULL;) {
IDOverrideLibraryPropertyOperation *opop_next = opop->next;

2
source/blender/modifiers/intern/MOD_util.c
View File

@@ -229,7 +229,7 @@ Mesh *MOD_deform_mesh_eval_get(Object *ob,
* that's properly generated for curves. */
mesh = BKE_mesh_new_nomain_from_curve(ob);
/* Currently, that may not be the case everytime
/* Currently, that may not be the case every time
* (texts e.g. tend to give issues,
* also when deforming curve points instead of generated curve geometry... ). */
if (mesh != NULL && mesh->totvert != num_verts) {

2
source/blender/windowmanager/intern/wm_dragdrop.c
View File

@@ -400,7 +400,7 @@ void wm_drags_draw(bContext *C, wmWindow *win, rcti *rect)
rect->ymin = rect->ymax = cursory;
}
/* XXX todo, multiline drag draws... but maybe not, more types mixed wont work well */
/* Should we support multi-line drag draws? Maybe not, more types mixed wont work well. */
GPU_blend(GPU_BLEND_ALPHA);
for (drag = wm->drags.first; drag; drag = drag->next) {
const uchar text_col[] = {255, 255, 255, 255};