Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2019-04-21 06:44:06 +0300
committerCampbell Barton <ideasman42@gmail.com>2019-04-21 07:27:35 +0300
commit93c19a5a2cf58b75aa3072ce79de5e5d571f3d55 (patch)
tree832c780931025206ac043340e9b39af6d804e425 /source/blender/blenkernel
parent9d72efe108cb5819d07e524f311f613d002d3b61 (diff)
Cleanup: comments (mainly long lines)
Comments after code can cause awkward line breaks.
Diffstat (limited to 'source/blender/blenkernel')
-rw-r--r--source/blender/blenkernel/BKE_mesh.h23
-rw-r--r--source/blender/blenkernel/intern/constraint.c5
-rw-r--r--source/blender/blenkernel/intern/library_remap.c12
-rw-r--r--source/blender/blenkernel/intern/mesh_remap.c15
-rw-r--r--source/blender/blenkernel/intern/object_dupli.c9
-rw-r--r--source/blender/blenkernel/intern/pbvh.c4
6 files changed, 40 insertions, 28 deletions
diff --git a/source/blender/blenkernel/BKE_mesh.h b/source/blender/blenkernel/BKE_mesh.h
index e89e1b05029..d4ad0e771d3 100644
--- a/source/blender/blenkernel/BKE_mesh.h
+++ b/source/blender/blenkernel/BKE_mesh.h
@@ -325,22 +325,25 @@ void BKE_edges_sharp_from_angle_set(const struct MVert *mverts,
* References a contiguous loop-fan with normal offset vars.
*/
typedef struct MLoopNorSpace {
- float vec_lnor[3]; /* Automatically computed loop normal. */
- float vec_ref[3]; /* Reference vector, orthogonal to vec_lnor. */
- float vec_ortho[3]; /* Third vector, orthogonal to vec_lnor and vec_ref. */
- float
- ref_alpha; /* Reference angle, around vec_ortho, in ]0, pi] range (0.0 marks that space as invalid). */
- float
- ref_beta; /* Reference angle, around vec_lnor, in ]0, 2pi] range (0.0 marks that space as invalid). */
- /* All loops using this lnor space (i.e. smooth fan of loops),
+ /** Automatically computed loop normal. */
+ float vec_lnor[3];
+ /** Reference vector, orthogonal to vec_lnor. */
+ float vec_ref[3];
+ /** Third vector, orthogonal to vec_lnor and vec_ref. */
+ float vec_ortho[3];
+ /** Reference angle, around vec_ortho, in ]0, pi] range (0.0 marks that space as invalid). */
+ float ref_alpha;
+ /** Reference angle, around vec_lnor, in ]0, 2pi] range (0.0 marks that space as invalid). */
+ float ref_beta;
+ /** All loops using this lnor space (i.e. smooth fan of loops),
* as (depending on owning MLoopNorSpaceArrary.data_type):
* - Indices (uint_in_ptr), or
* - BMLoop pointers. */
struct LinkNode *loops;
char flags;
- void *
- user_data; /* To be used for extended processing related to loop normal spaces (aka smooth fans). */
+ /** To be used for extended processing related to loop normal spaces (aka smooth fans). */
+ void *user_data;
} MLoopNorSpace;
/**
* MLoopNorSpace.flags
diff --git a/source/blender/blenkernel/intern/constraint.c b/source/blender/blenkernel/intern/constraint.c
index 01dc7c6b3ad..1ceaf8f6821 100644
--- a/source/blender/blenkernel/intern/constraint.c
+++ b/source/blender/blenkernel/intern/constraint.c
@@ -1404,8 +1404,9 @@ static void followpath_evaluate(bConstraint *con, bConstraintOb *cob, ListBase *
mul_m4_m4m4(cob->matrix, ct->matrix, obmat);
/* un-apply scaling caused by path */
- if ((data->followflag & FOLLOWPATH_RADIUS) ==
- 0) { /* XXX - assume that scale correction means that radius will have some scale error in it - Campbell */
+ if ((data->followflag & FOLLOWPATH_RADIUS) == 0) {
+ /* XXX: Assume that scale correction means that radius
+ * will have some scale error in it - Campbell. */
float obsize[3];
mat4_to_size(obsize, cob->matrix);
diff --git a/source/blender/blenkernel/intern/library_remap.c b/source/blender/blenkernel/intern/library_remap.c
index d334804dcd6..5baa7fb3cf8 100644
--- a/source/blender/blenkernel/intern/library_remap.c
+++ b/source/blender/blenkernel/intern/library_remap.c
@@ -145,14 +145,18 @@ typedef struct IDRemap {
Main *bmain; /* Only used to trigger depsgraph updates in the right bmain. */
ID *old_id;
ID *new_id;
- ID *id; /* The ID in which we are replacing old_id by new_id usages. */
+ /** The ID in which we are replacing old_id by new_id usages. */
+ ID *id;
short flag;
/* 'Output' data. */
short status;
- int skipped_direct; /* Number of direct usecases that could not be remapped (e.g.: obdata when in edit mode). */
- int skipped_indirect; /* Number of indirect usecases that could not be remapped. */
- int skipped_refcounted; /* Number of skipped usecases that refcount the datablock. */
+ /** Number of direct usecases that could not be remapped (e.g.: obdata when in edit mode). */
+ int skipped_direct;
+ /** Number of indirect usecases that could not be remapped. */
+ int skipped_indirect;
+ /** Number of skipped usecases that refcount the datablock. */
+ int skipped_refcounted;
} IDRemap;
/* IDRemap->flag enums defined in BKE_library.h */
diff --git a/source/blender/blenkernel/intern/mesh_remap.c b/source/blender/blenkernel/intern/mesh_remap.c
index b43339bf73f..6799c6f5c43 100644
--- a/source/blender/blenkernel/intern/mesh_remap.c
+++ b/source/blender/blenkernel/intern/mesh_remap.c
@@ -445,13 +445,16 @@ static int mesh_remap_interp_poly_data_get(const MPoly *mp,
return sources_num;
}
-/* Little helper when dealing with source islands */
+/** Little helper when dealing with source islands */
typedef struct IslandResult {
- float
- factor; /* A factor, based on which best island for a given set of elements will be selected. */
- int index_src; /* Index of the source. */
- float hit_dist; /* The actual hit distance. */
- float hit_point[3]; /* The hit point, if relevant. */
+ /** A factor, based on which best island for a given set of elements will be selected. */
+ float factor;
+ /** Index of the source. */
+ int index_src;
+ /** The actual hit distance. */
+ float hit_dist;
+ /** The hit point, if relevant. */
+ float hit_point[3];
} IslandResult;
/* Note about all bvh/raycasting stuff below:
diff --git a/source/blender/blenkernel/intern/object_dupli.c b/source/blender/blenkernel/intern/object_dupli.c
index 2544bb6a8f0..9a0e972c46b 100644
--- a/source/blender/blenkernel/intern/object_dupli.c
+++ b/source/blender/blenkernel/intern/object_dupli.c
@@ -66,9 +66,10 @@
typedef struct DupliContext {
Depsgraph *depsgraph;
- Collection
- *collection; /* XXX child objects are selected from this group if set, could be nicer */
- Object *obedit; /* Only to check if the object is in edit-mode. */
+ /** XXX child objects are selected from this group if set, could be nicer. */
+ Collection *collection;
+ /** Only to check if the object is in edit-mode. */
+ Object *obedit;
Scene *scene;
ViewLayer *view_layer;
@@ -80,7 +81,7 @@ typedef struct DupliContext {
const struct DupliGenerator *gen;
- /* result containers */
+ /** Result containers. */
ListBase *duplilist; /* legacy doubly-linked list */
} DupliContext;
diff --git a/source/blender/blenkernel/intern/pbvh.c b/source/blender/blenkernel/intern/pbvh.c
index 7933f98868a..6529cdb06d7 100644
--- a/source/blender/blenkernel/intern/pbvh.c
+++ b/source/blender/blenkernel/intern/pbvh.c
@@ -505,8 +505,8 @@ static void pbvh_build(PBVH *bvh, BB *cb, BBC *prim_bbc, int totprim)
/**
* Do a full rebuild with on Mesh data structure.
*
- * \note Unlike mpoly/mloop/verts, looptri is **totally owned** by PBVH (which means it may rewrite it if needed,
- * see #BKE_pbvh_apply_vertCos().
+ * \note Unlike mpoly/mloop/verts, looptri is **totally owned** by PBVH
+ * (which means it may rewrite it if needed, see #BKE_pbvh_apply_vertCos().
*/
void BKE_pbvh_build_mesh(PBVH *bvh,
const MPoly *mpoly,