From 03173d63c01aede48f361ce83f53e5e9d8236c05 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Fri, 8 Jul 2022 09:10:30 +1000 Subject: Cleanup: spelling in comments Also move mis-placed doc-string. --- source/blender/blenkernel/BKE_armature.h | 2 +- source/blender/blenkernel/BKE_mball.h | 3 ++- source/blender/blenkernel/BKE_object.h | 9 ++++++--- source/blender/blenkernel/intern/image_save.cc | 2 +- source/blender/blenkernel/intern/mball.c | 17 ++++++++++------- 5 files changed, 20 insertions(+), 13 deletions(-) (limited to 'source/blender/blenkernel') diff --git a/source/blender/blenkernel/BKE_armature.h b/source/blender/blenkernel/BKE_armature.h index 98f9f8e3588..ee0f41937e2 100644 --- a/source/blender/blenkernel/BKE_armature.h +++ b/source/blender/blenkernel/BKE_armature.h @@ -159,7 +159,7 @@ struct BoundBox *BKE_armature_boundbox_get(struct Object *ob); * Visual elements such as the envelopes radius & bendy-bone spline segments are *not* included, * making this not so useful for viewport culling. * - * \param use_empty_drawtype: When enabled, the draw type of empty custom-objects is tagen into + * \param use_empty_drawtype: When enabled, the draw type of empty custom-objects is taken into * account when calculating the bounds. */ void BKE_pchan_minmax(const struct Object *ob, diff --git a/source/blender/blenkernel/BKE_mball.h b/source/blender/blenkernel/BKE_mball.h index 5a4988c7a5f..a23d010b51f 100644 --- a/source/blender/blenkernel/BKE_mball.h +++ b/source/blender/blenkernel/BKE_mball.h @@ -75,7 +75,8 @@ float *BKE_mball_make_orco(struct Object *ob, struct ListBase *dispbase); * When some properties (wire-size, threshold, update flags) of meta-ball are changed, then this * properties are copied to all meta-balls in same "group" (meta-balls with same base name: * `MBall`, `MBall.001`, `MBall.002`, etc). The most important is to copy properties to the base - * meta-ball, because this meta-ball influences polygonization of meta-balls. */ + * meta-ball, because this meta-ball influences polygonization of meta-balls. + */ void BKE_mball_properties_copy(struct Main *bmain, struct MetaBall *active_metaball); bool BKE_mball_minmax_ex( diff --git a/source/blender/blenkernel/BKE_object.h b/source/blender/blenkernel/BKE_object.h index 96abea0e5ee..f0eb16a819d 100644 --- a/source/blender/blenkernel/BKE_object.h +++ b/source/blender/blenkernel/BKE_object.h @@ -366,9 +366,6 @@ void BKE_object_empty_draw_type_set(struct Object *ob, int value); void BKE_object_boundbox_calc_from_mesh(struct Object *ob, const struct Mesh *me_eval); bool BKE_object_boundbox_calc_from_evaluated_geometry(struct Object *ob); -/** - * Calculate visual bounds from an empty objects draw-type. - */ void BKE_object_minmax(struct Object *ob, float r_min[3], float r_max[3], bool use_hidden); bool BKE_object_minmax_dupli(struct Depsgraph *depsgraph, struct Scene *scene, @@ -376,6 +373,12 @@ bool BKE_object_minmax_dupli(struct Depsgraph *depsgraph, float r_min[3], float r_max[3], bool use_hidden); +/** + * Calculate visual bounds from an empty objects draw-type. + * + * \note This is not part of the calculation used by #BKE_object_boundbox_get + * as these bounds represent the extents of visual guides (use for viewport culling for e.g.) + */ bool BKE_object_minmax_empty_drawtype(const struct Object *ob, float r_min[3], float r_max[3]); /** diff --git a/source/blender/blenkernel/intern/image_save.cc b/source/blender/blenkernel/intern/image_save.cc index 07ffc35907a..3f6f81845e2 100644 --- a/source/blender/blenkernel/intern/image_save.cc +++ b/source/blender/blenkernel/intern/image_save.cc @@ -290,7 +290,7 @@ static void image_save_post(ReportList *reports, BLI_strncpy(ibuf->name, filepath, sizeof(ibuf->name)); } - /* The tiled image codepath must call this on its own. */ + /* The tiled image code-path must call this on its own. */ if (ima->source != IMA_SRC_TILED) { image_save_update_filepath(ima, filepath, opts); } diff --git a/source/blender/blenkernel/intern/mball.c b/source/blender/blenkernel/intern/mball.c index 819bbde6556..2a1c940493c 100644 --- a/source/blender/blenkernel/intern/mball.c +++ b/source/blender/blenkernel/intern/mball.c @@ -434,13 +434,16 @@ static void mball_data_properties_copy(MetaBall *mb_dst, MetaBall *mb_src) void BKE_mball_properties_copy(Main *bmain, MetaBall *metaball_src) { - /* WARNING: This code does not cover all potential corner-cases. E.g. if: - * | Object | ObData | - * | ---------- | ---------- | - * | Meta_A | Meta_A | - * | Meta_A.001 | Meta_A.001 | - * | Meta_B | Meta_A | - * | Meta_B.001 | Meta_B.001 | + /** + * WARNING: This code does not cover all potential corner-cases. E.g. if: + *
+   * |   Object   |   ObData   |
+   * | ---------- | ---------- |
+   * | Meta_A     | Meta_A     |
+   * | Meta_A.001 | Meta_A.001 |
+   * | Meta_B     | Meta_A     |
+   * | Meta_B.001 | Meta_B.001 |
+   * 
* * Calling this function with `metaball_src` being `Meta_A.001` will update `Meta_A`, but NOT * `Meta_B.001`. So in the 'Meta_B' family, the two metaballs will have unmatching settings now. -- cgit v1.2.3