diff options
author | Campbell Barton <ideasman42@gmail.com> | 2019-08-16 17:54:22 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2019-08-16 17:57:05 +0300 |
commit | 27907408136cd3339beac5ea98318830ff837ab6 (patch) | |
tree | c2227cef3b363391544dce1370f6a7c21be464fa /source/blender/blenkernel/intern | |
parent | 05edcf632950a81adb4a165340e01c5c92f1c578 (diff) |
Cleanup: spelling
Diffstat (limited to 'source/blender/blenkernel/intern')
-rw-r--r-- | source/blender/blenkernel/intern/armature_update.c | 2 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/customdata.c | 28 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/editmesh.c | 15 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/library.c | 4 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/mask.c | 4 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/mball.c | 5 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/mesh_evaluate.c | 4 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/object_update.c | 2 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/ocean.c | 2 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/softbody.c | 2 |
10 files changed, 33 insertions, 35 deletions
diff --git a/source/blender/blenkernel/intern/armature_update.c b/source/blender/blenkernel/intern/armature_update.c index bf7d81e5d63..cd1cdce91e0 100644 --- a/source/blender/blenkernel/intern/armature_update.c +++ b/source/blender/blenkernel/intern/armature_update.c @@ -889,7 +889,7 @@ void BKE_pose_eval_proxy_copy_bone(struct Depsgraph *depsgraph, Object *object, bPoseChannel *pchan = pose_pchan_get_indexed(object, pchan_index); DEG_debug_print_eval_subdata( depsgraph, __func__, object->id.name, object, "pchan", pchan->name, pchan); - /* TODO(sergey): Use indexec lookup, once it's guaranteed to be kept + /* TODO(sergey): Use indexed lookup, once it's guaranteed to be kept * around for the time while proxies are evaluating. */ #if 0 diff --git a/source/blender/blenkernel/intern/customdata.c b/source/blender/blenkernel/intern/customdata.c index 3c7ac5d8d2e..db0ed0dc0fb 100644 --- a/source/blender/blenkernel/intern/customdata.c +++ b/source/blender/blenkernel/intern/customdata.c @@ -294,7 +294,7 @@ static void layerInterp_mdeformvert(const void **sources, } } - /* delay writing to the destination incase dest is in sources */ + /* Delay writing to the destination in case dest is in sources. */ /* now we know how many unique deform weights there are, so realloc */ if (dvert->dw && (dvert->totweight == totweight)) { @@ -441,7 +441,7 @@ static void layerInterp_tface( } } - /* delay writing to the destination incase dest is in sources */ + /* Delay writing to the destination in case dest is in sources. */ *tf = *(MTFace *)(*sources); memcpy(tf->uv, uv, sizeof(tf->uv)); } @@ -548,7 +548,7 @@ static void layerInterp_origspace_face( } } - /* delay writing to the destination in case dest is in sources */ + /* Delay writing to the destination in case dest is in sources. */ memcpy(osf->uv, uv, sizeof(osf->uv)); } @@ -908,7 +908,7 @@ static void layerInterp_mloopcol( /* Subdivide smooth or fractal can cause problems without clamping * although weights should also not cause this situation */ - /* also delay writing to the destination incase dest is in sources */ + /* Also delay writing to the destination in case dest is in sources. */ mc->r = round_fl_to_uchar_clamp(col.r); mc->g = round_fl_to_uchar_clamp(col.g); mc->b = round_fl_to_uchar_clamp(col.b); @@ -1008,7 +1008,7 @@ static void layerInterp_mloopuv( } } - /* delay writing to the destination incase dest is in sources */ + /* Delay writing to the destination in case dest is in sources. */ copy_v2_v2(((MLoopUV *)dest)->uv, uv); ((MLoopUV *)dest)->flag = flag; } @@ -1104,7 +1104,7 @@ static void layerInterp_mloop_origspace( } } - /* delay writing to the destination incase dest is in sources */ + /* Delay writing to the destination in case dest is in sources. */ copy_v2_v2(((OrigSpaceLoop *)dest)->uv, uv); } /* --- end copy */ @@ -1152,7 +1152,7 @@ static void layerInterp_mcol( } } - /* delay writing to the destination incase dest is in sources */ + /* Delay writing to the destination in case dest is in sources. */ for (j = 0; j < 4; ++j) { /* Subdivide smooth or fractal can cause problems without clamping @@ -1220,7 +1220,7 @@ static void layerInterp_bweight(const void **sources, } } - /* delay writing to the destination incase dest is in sources */ + /* Delay writing to the destination in case dest is in sources. */ *((float *)dest) = f; } @@ -1251,7 +1251,7 @@ static void layerInterp_shapekey(const void **sources, } } - /* delay writing to the destination incase dest is in sources */ + /* Delay writing to the destination in case dest is in sources. */ copy_v3_v3((float *)dest, co); } @@ -1289,7 +1289,7 @@ static void layerInterp_mvert_skin(const void **sources, madd_v3_v3fl(radius, vs_src->radius, w); } - /* delay writing to the destination incase dest is in sources */ + /* Delay writing to the destination in case dest is in sources. */ vs_dst = dest; copy_v3_v3(vs_dst->radius, radius); vs_dst->flag &= ~MVERT_SKIN_ROOT; @@ -2828,9 +2828,7 @@ void CustomData_interp(const CustomData *source, const void *source_buf[SOURCE_BUF_SIZE]; const void **sources = source_buf; - /* slow fallback in case we're interpolating a ridiculous number of - * elements - */ + /* Slow fallback in case we're interpolating a ridiculous number of elements. */ if (count > SOURCE_BUF_SIZE) { sources = MEM_malloc_arrayN(count, sizeof(*sources), __func__); } @@ -3828,9 +3826,7 @@ void CustomData_bmesh_interp(CustomData *data, void *source_buf[SOURCE_BUF_SIZE]; const void **sources = (const void **)source_buf; - /* slow fallback in case we're interpolating a ridiculous number of - * elements - */ + /* Slow fallback in case we're interpolating a ridiculous number of elements. */ if (count > SOURCE_BUF_SIZE) { sources = MEM_malloc_arrayN(count, sizeof(*sources), __func__); } diff --git a/source/blender/blenkernel/intern/editmesh.c b/source/blender/blenkernel/intern/editmesh.c index b8234ccc5bb..1c3f6a56629 100644 --- a/source/blender/blenkernel/intern/editmesh.c +++ b/source/blender/blenkernel/intern/editmesh.c @@ -61,11 +61,10 @@ BMEditMesh *BKE_editmesh_copy(BMEditMesh *em) /* The tessellation is NOT calculated on the copy here, * because currently all the callers of this function use - * it to make a backup copy of the BMEditMesh to restore - * it in the case of errors in an operation. For perf - * reasons, in that case it makes more sense to do the - * tessellation only when/if that copy ends up getting - * used.*/ + * it to make a backup copy of the #BMEditMesh to restore + * it in the case of errors in an operation. For performance reasons, + * in that case it makes more sense to do the + * tessellation only when/if that copy ends up getting used. */ em_copy->looptris = NULL; return em_copy; @@ -97,8 +96,8 @@ static void editmesh_tessface_calc_intern(BMEditMesh *em) BMesh *bm = em->bm; - /* this assumes all faces can be scan-filled, which isn't always true, - * worst case we over alloc a little which is acceptable */ + /* This assumes all faces can be scan-filled, which isn't always true, + * worst case we over allocate a little which is acceptable. */ const int looptris_tot = poly_to_tri_count(bm->totface, bm->totloop); const int looptris_tot_prev_alloc = em->looptris ? (MEM_allocN_len(em->looptris) / sizeof(*em->looptris)) : @@ -109,7 +108,7 @@ static void editmesh_tessface_calc_intern(BMEditMesh *em) /* this means no reallocs for quad dominant models, for */ if ((em->looptris != NULL) && /* (*em->tottri >= looptris_tot)) */ - /* check against alloc'd size incase we over alloc'd a little */ + /* Check against allocated size in case we over allocated a little. */ ((looptris_tot_prev_alloc >= looptris_tot) && (looptris_tot_prev_alloc <= looptris_tot * 2))) { looptris = em->looptris; diff --git a/source/blender/blenkernel/intern/library.c b/source/blender/blenkernel/intern/library.c index de6f5142a19..2dbca3b4db1 100644 --- a/source/blender/blenkernel/intern/library.c +++ b/source/blender/blenkernel/intern/library.c @@ -1727,8 +1727,8 @@ bool BKE_id_new_name_validate(ListBase *lb, ID *id, const char *tname) /* This was in 2.43 and previous releases * however all data in blender should be sorted, not just duplicate names - * sorting should not hurt, but noting just incase it alters the way other - * functions work, so sort every time */ + * sorting should not hurt, but noting just in case it alters the way other + * functions work, so sort every time. */ #if 0 if (result) { id_sort_by_name(lb, id); diff --git a/source/blender/blenkernel/intern/mask.c b/source/blender/blenkernel/intern/mask.c index b6d61563fe8..fc087ff91b2 100644 --- a/source/blender/blenkernel/intern/mask.c +++ b/source/blender/blenkernel/intern/mask.c @@ -1628,7 +1628,9 @@ MaskLayerShape *BKE_mask_layer_shape_find_frame(MaskLayer *masklay, const int fr return NULL; } -/* when returning 2 - the frame isnt found but before/after frames are */ +/** + * When returning 2 - the frame isn't found but before/after frames are. + */ int BKE_mask_layer_shape_find_frame_range(MaskLayer *masklay, const float frame, MaskLayerShape **r_masklay_shape_a, diff --git a/source/blender/blenkernel/intern/mball.c b/source/blender/blenkernel/intern/mball.c index d6fa071009e..0820f0ebbb1 100644 --- a/source/blender/blenkernel/intern/mball.c +++ b/source/blender/blenkernel/intern/mball.c @@ -364,12 +364,13 @@ bool BKE_mball_is_any_unselected(const MetaBall *mb) return false; } -/* \brief copy some properties from object to other metaball object with same base name +/** + * \brief copy some properties from object to other metaball object with same base name * * When some properties (wiresize, threshold, update flags) of metaball are changed, then this * properties are copied to all metaballs in same "group" (metaballs with same base name: MBall, * MBall.001, MBall.002, etc). The most important is to copy properties to the base metaball, - * because this metaball influence polygonisation of metaballs. */ + * because this metaball influence polygonization of metaballs. */ void BKE_mball_properties_copy(Scene *scene, Object *active_object) { Scene *sce_iter = scene; diff --git a/source/blender/blenkernel/intern/mesh_evaluate.c b/source/blender/blenkernel/intern/mesh_evaluate.c index 2ea275cdfb0..ad06f4b7da1 100644 --- a/source/blender/blenkernel/intern/mesh_evaluate.c +++ b/source/blender/blenkernel/intern/mesh_evaluate.c @@ -1320,7 +1320,7 @@ static void split_loop_nor_fan_do(LoopSplitTaskDataCommon *common_data, LoopSpli } // print_v2("new clnors", clnors_avg); } - /* Extra bonus: since smallstack is local to this func, + /* Extra bonus: since small-stack is local to this function, * no more need to empty it at all cost! */ BKE_lnor_space_custom_data_to_normal(lnor_space, *clnor_ref, lnor); @@ -1336,7 +1336,7 @@ static void split_loop_nor_fan_do(LoopSplitTaskDataCommon *common_data, LoopSpli copy_v3_v3(nor, lnor); } } - /* Extra bonus: since smallstack is local to this func, + /* Extra bonus: since small-stack is local to this funcion, * no more need to empty it at all cost! */ } } diff --git a/source/blender/blenkernel/intern/object_update.c b/source/blender/blenkernel/intern/object_update.c index 202eadaa35a..49f5aa35f93 100644 --- a/source/blender/blenkernel/intern/object_update.c +++ b/source/blender/blenkernel/intern/object_update.c @@ -432,7 +432,7 @@ void BKE_object_eval_eval_base_flags(Depsgraph *depsgraph, BKE_base_eval_flags(base); /* For render, compute base visibility again since BKE_base_eval_flags - * assumed viewport visibility. Selectability does not matter here. */ + * assumed viewport visibility. Select-ability does not matter here. */ if (DEG_get_mode(depsgraph) == DAG_EVAL_RENDER) { if (base->flag & BASE_ENABLED_RENDER) { base->flag |= BASE_VISIBLE; diff --git a/source/blender/blenkernel/intern/ocean.c b/source/blender/blenkernel/intern/ocean.c index 39fb668c873..fcceebc3913 100644 --- a/source/blender/blenkernel/intern/ocean.c +++ b/source/blender/blenkernel/intern/ocean.c @@ -519,7 +519,7 @@ static void ocean_compute_htilda(void *__restrict userdata, int j; - /* note the <= _N/2 here, see the fftw doco + /* Note the <= _N/2 here, see the FFTW documentation * about the mechanics of the complex->real fft storage. */ for (j = 0; j <= o->_N / 2; ++j) { fftw_complex exp_param1; diff --git a/source/blender/blenkernel/intern/softbody.c b/source/blender/blenkernel/intern/softbody.c index 20736e28a53..d3b72fb295d 100644 --- a/source/blender/blenkernel/intern/softbody.c +++ b/source/blender/blenkernel/intern/softbody.c @@ -2705,7 +2705,7 @@ static void mesh_to_softbody(Scene *scene, Object *ob) for (a = 0; a < me->totvert; a++, bp++) { /* get scalar values needed *per vertex* from vertex group functions, - * so we can *paint* them nicly .. + * so we can *paint* them nicely .. * they are normalized [0.0..1.0] so may be we need amplitude for scale * which can be done by caller but still .. i'd like it to go this way */ |