[Bf-blender-cvs] [e927ce8acb6] master: Cleanup: avoid line breaks from trailing comments
Campbell Barton
noreply at git.blender.org
Wed Jul 10 06:42:52 CEST 2019
Commit: e927ce8acb6848974077fbbd6dc110dd3948b48a
Author: Campbell Barton
Date: Wed Jul 10 14:41:19 2019 +1000
Branches: master
https://developer.blender.org/rBe927ce8acb6848974077fbbd6dc110dd3948b48a
Cleanup: avoid line breaks from trailing comments
===================================================================
M source/blender/blenkernel/intern/curve.c
M source/blender/blenkernel/intern/mesh.c
M source/blender/blenkernel/intern/smoke.c
M source/blender/blenloader/intern/readfile.c
M source/blender/blenloader/intern/writefile.c
M source/blender/editors/space_info/info_ops.c
M source/blender/editors/transform/transform_snap.c
M source/blender/freestyle/intern/python/BPy_FrsMaterial.cpp
M source/blender/freestyle/intern/python/BPy_StrokeAttribute.cpp
M source/blender/freestyle/intern/python/Interface0D/CurvePoint/BPy_StrokeVertex.cpp
M source/blender/freestyle/intern/python/Interface1D/BPy_Stroke.cpp
M source/blender/imbuf/intern/openexr/openexr_api.cpp
M source/blender/makesrna/intern/rna_rna.c
M source/blender/modifiers/intern/MOD_decimate.c
M source/blender/nodes/shader/nodes/node_shader_math.c
M source/blender/nodes/shader/nodes/node_shader_vectMath.c
M source/blender/python/mathutils/mathutils_Vector.c
===================================================================
diff --git a/source/blender/blenkernel/intern/curve.c b/source/blender/blenkernel/intern/curve.c
index 8a2450efa55..931c0ed73d3 100644
--- a/source/blender/blenkernel/intern/curve.c
+++ b/source/blender/blenkernel/intern/curve.c
@@ -1818,8 +1818,9 @@ void BKE_curve_bevel_make(Object *ob, ListBase *disp)
fp[3] = fp[4] = 0.0;
fp[5] = cu->ext1;
}
- else if ((cu->flag & (CU_FRONT | CU_BACK)) == 0 &&
- cu->ext1 == 0.0f) { /* we make a full round bevel in that case */
+ else if ((cu->flag & (CU_FRONT | CU_BACK)) == 0 && cu->ext1 == 0.0f) {
+ /* We make a full round bevel in that case. */
+
nr = 4 + 2 * cu->bevresol;
dl = MEM_callocN(sizeof(DispList), "makebevelcurve p1");
@@ -4742,8 +4743,8 @@ bool BKE_nurb_check_valid_u(const Nurb *nu)
if (nu->pntsu < nu->orderu) {
return false;
}
- if (((nu->flagu & CU_NURB_CYCLIC) == 0) &&
- (nu->flagu & CU_NURB_BEZIER)) { /* Bezier U Endpoints */
+ if (((nu->flagu & CU_NURB_CYCLIC) == 0) && (nu->flagu & CU_NURB_BEZIER)) {
+ /* Bezier U Endpoints */
if (nu->orderu == 4) {
if (nu->pntsu < 5) {
return false; /* bezier with 4 orderu needs 5 points */
@@ -4769,8 +4770,8 @@ bool BKE_nurb_check_valid_v(const Nurb *nu)
if (nu->pntsv < nu->orderv) {
return false;
}
- if (((nu->flagv & CU_NURB_CYCLIC) == 0) &&
- (nu->flagv & CU_NURB_BEZIER)) { /* Bezier V Endpoints */
+ if (((nu->flagv & CU_NURB_CYCLIC) == 0) && (nu->flagv & CU_NURB_BEZIER)) {
+ /* Bezier V Endpoints */
if (nu->orderv == 4) {
if (nu->pntsv < 5) {
return false; /* bezier with 4 orderu needs 5 points */
diff --git a/source/blender/blenkernel/intern/mesh.c b/source/blender/blenkernel/intern/mesh.c
index e6fbc386b77..04164de91ca 100644
--- a/source/blender/blenkernel/intern/mesh.c
+++ b/source/blender/blenkernel/intern/mesh.c
@@ -558,8 +558,9 @@ void BKE_mesh_copy_data(Main *bmain, Mesh *me_dst, const Mesh *me_src, const int
/* XXX WHAT? Why? Comment, please! And pretty sure this is not valid for regular Mesh copying? */
me_dst->runtime.is_original = false;
- const bool do_tessface = ((me_src->totface != 0) &&
- (me_src->totpoly == 0)); /* only do tessface if we have no polys */
+ /* Only do tessface if we have no polys. */
+ const bool do_tessface = ((me_src->totface != 0) && (me_src->totpoly == 0));
+
CustomData_MeshMasks mask = CD_MASK_MESH;
if (me_src->id.tag & LIB_TAG_NO_MAIN) {
diff --git a/source/blender/blenkernel/intern/smoke.c b/source/blender/blenkernel/intern/smoke.c
index d6858e2d4d2..bb8fd18ea58 100644
--- a/source/blender/blenkernel/intern/smoke.c
+++ b/source/blender/blenkernel/intern/smoke.c
@@ -1402,9 +1402,9 @@ static void emit_from_particles(Object *flow_ob,
Scene *scene,
float dt)
{
+ /* Is particle system selected. */
if (sfs && sfs->psys && sfs->psys->part &&
- ELEM(sfs->psys->part->type, PART_EMITTER, PART_FLUID)) // is particle system selected
- {
+ ELEM(sfs->psys->part->type, PART_EMITTER, PART_FLUID)) {
ParticleSimulationData sim;
ParticleSystem *psys = sfs->psys;
float *particle_pos;
diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c
index e750b84efa0..44039ad59ee 100644
--- a/source/blender/blenloader/intern/readfile.c
+++ b/source/blender/blenloader/intern/readfile.c
@@ -1712,22 +1712,26 @@ BlendThumbnail *BLO_thumbnail_from_file(const char *filepath)
/** \name Old/New Pointer Map
* \{ */
-static void *newdataadr(FileData *fd, const void *adr) /* only direct databocks */
+/* only direct databocks */
+static void *newdataadr(FileData *fd, const void *adr)
{
return oldnewmap_lookup_and_inc(fd->datamap, adr, true);
}
-static void *newdataadr_no_us(FileData *fd, const void *adr) /* only direct databocks */
+/* only direct databocks */
+static void *newdataadr_no_us(FileData *fd, const void *adr)
{
return oldnewmap_lookup_and_inc(fd->datamap, adr, false);
}
-static void *newglobadr(FileData *fd, const void *adr) /* direct data-locks with global linking */
+/* direct datablocks with global linking */
+static void *newglobadr(FileData *fd, const void *adr)
{
return oldnewmap_lookup_and_inc(fd->globmap, adr, true);
}
-static void *newimaadr(FileData *fd, const void *adr) /* used to restore image data after undo */
+/* used to restore image data after undo */
+static void *newimaadr(FileData *fd, const void *adr)
{
if (fd->imamap && adr) {
return oldnewmap_lookup_and_inc(fd->imamap, adr, true);
@@ -1735,7 +1739,8 @@ static void *newimaadr(FileData *fd, const void *adr) /* used to restore image d
return NULL;
}
-static void *newsceadr(FileData *fd, const void *adr) /* used to restore scene data after undo */
+/* used to restore scene data after undo */
+static void *newsceadr(FileData *fd, const void *adr)
{
if (fd->scenemap && adr) {
return oldnewmap_lookup_and_inc(fd->scenemap, adr, true);
@@ -1743,8 +1748,8 @@ static void *newsceadr(FileData *fd, const void *adr) /* used to restore scene d
return NULL;
}
-static void *newmclipadr(FileData *fd,
- const void *adr) /* used to restore movie clip data after undo */
+/* used to restore movie clip data after undo */
+static void *newmclipadr(FileData *fd, const void *adr)
{
if (fd->movieclipmap && adr) {
return oldnewmap_lookup_and_inc(fd->movieclipmap, adr, true);
@@ -1752,7 +1757,8 @@ static void *newmclipadr(FileData *fd,
return NULL;
}
-static void *newsoundadr(FileData *fd, const void *adr) /* used to restore sound data after undo */
+/* used to restore sound data after undo */
+static void *newsoundadr(FileData *fd, const void *adr)
{
if (fd->soundmap && adr) {
return oldnewmap_lookup_and_inc(fd->soundmap, adr, true);
@@ -1760,8 +1766,8 @@ static void *newsoundadr(FileData *fd, const void *adr) /* used to restore sound
return NULL;
}
-static void *newpackedadr(FileData *fd,
- const void *adr) /* used to restore packed data after undo */
+/* used to restore packed data after undo */
+static void *newpackedadr(FileData *fd, const void *adr)
{
if (fd->packedmap && adr) {
return oldnewmap_lookup_and_inc(fd->packedmap, adr, true);
@@ -1770,19 +1776,20 @@ static void *newpackedadr(FileData *fd,
return oldnewmap_lookup_and_inc(fd->datamap, adr, true);
}
-static void *newlibadr(FileData *fd, const void *lib, const void *adr) /* only lib data */
+/* only lib data */
+static void *newlibadr(FileData *fd, const void *lib, const void *adr)
{
return oldnewmap_liblookup(fd->libmap, adr, lib);
}
-void *blo_do_versions_newlibadr(FileData *fd, const void *lib, const void *adr) /* only lib data */
+/* only lib data */
+void *blo_do_versions_newlibadr(FileData *fd, const void *lib, const void *adr)
{
return newlibadr(fd, lib, adr);
}
-static void *newlibadr_us(FileData *fd,
- const void *lib,
- const void *adr) /* increases user number */
+/* increases user number */
+static void *newlibadr_us(FileData *fd, const void *lib, const void *adr)
{
ID *id = newlibadr(fd, lib, adr);
@@ -1791,16 +1798,14 @@ static void *newlibadr_us(FileData *fd,
return id;
}
-void *blo_do_versions_newlibadr_us(FileData *fd,
- const void *lib,
- const void *adr) /* increases user number */
+/* increases user number */
+void *blo_do_versions_newlibadr_us(FileData *fd, const void *lib, const void *adr)
{
return newlibadr_us(fd, lib, adr);
}
-static void *newlibadr_real_us(FileData *fd,
- const void *lib,
- const void *adr) /* ensures real user */
+/* ensures real user */
+static void *newlibadr_real_us(FileData *fd, const void *lib, const void *adr)
{
ID *id = newlibadr(fd, lib, adr);
diff --git a/source/blender/blenloader/intern/writefile.c b/source/blender/blenloader/intern/writefile.c
index 115387a697b..5954ba9cf8e 100644
--- a/source/blender/blenloader/intern/writefile.c
+++ b/source/blender/blenloader/intern/writefile.c
@@ -553,10 +553,8 @@ static void writestruct_id(
writestruct_at_address_id(wd, filecode, structname, nr, adr, adr);
}
-static void writedata(WriteData *wd,
- int filecode,
- int len,
- const void *adr) /* do not use for structs */
+/* do not use for structs */
+static void writedata(WriteData *wd, int filecode, int len, const void *adr)
{
BHead bh;
diff --git a/source/blender/editors/space_info/info_ops.c b/source/blender/editors/space_info/info_ops.c
index 6460c3db8c2..14817e9ffa1 100644
--- a/source/blender/editors/space_info/info_ops.c
+++ b/source/blender/editors/space_info/info_ops.c
@@ -545,7 +545,8 @@ static int update_reports_display_invoke(bContext *C, wmOperator *UNUSED(op), co
/* escape if not our timer */
if ((reports->reporttimer == NULL) || (reports->reporttimer != event->customdata) ||
- ((report = BKE_reports_last_displayable(reports)) == NULL) /* may have been deleted */
+ ((report = BKE_reports_last_displayable(reports)) == NULL)
+ /* may have been deleted */
) {
return OPERATOR_PASS_THROUGH;
}
diff --git a/source/blender/editors/transform/transform_snap.c b/source/blender/editors/transform/transform_snap.c
index 58a50da9846..d45a0588003 100644
--- a/source/blender/editors/transform/transform_snap.c
+++ b/source/blender/editors/transform/transform_snap.c
@@ -566,13 +566,8 @@ static void initSnappingMode(TransInfo *t)
/* Edit mode */
if (t->tsnap.applySnap != NULL && // A snapping function actually exist
((obedit_type != -1) &&
- ELEM(obedit_type,
- OB_MESH,
- OB_ARMATURE,
- OB_CURVE,
- OB_LATTICE,
- OB_MBALL))) // Temporary limited to edit mode meshes, armature, curves, metaballs
- {
+ /* Temporary limited to edit mode meshes, armature, curves, metaballs. */
+ ELEM(obedit_type, OB_MESH, OB_ARMATURE, OB_C
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list