[Bf-blender-cvs] [aba4e6810f8] master: Cleanup: style, use braces in source/ (include disabled blocks)
Campbell Barton
noreply at git.blender.org
Fri May 31 15:28:50 CEST 2019
Commit: aba4e6810f8b4d0e459137b64e061a2cadc457d1
Author: Campbell Barton
Date: Fri May 31 23:21:16 2019 +1000
Branches: master
https://developer.blender.org/rBaba4e6810f8b4d0e459137b64e061a2cadc457d1
Cleanup: style, use braces in source/ (include disabled blocks)
===================================================================
M source/blender/blenkernel/intern/cdderivedmesh.c
M source/blender/blenkernel/intern/cloth.c
M source/blender/blenkernel/intern/dynamicpaint.c
M source/blender/blenkernel/intern/font.c
M source/blender/blenkernel/intern/ipo.c
M source/blender/blenkernel/intern/library.c
M source/blender/blenkernel/intern/softbody.c
M source/blender/blenlib/intern/math_base_inline.c
M source/blender/blenlib/intern/math_geom.c
M source/blender/blenlib/intern/smallhash.c
M source/blender/blenloader/intern/readfile.c
M source/blender/blenloader/intern/versioning_270.c
M source/blender/bmesh/intern/bmesh_mods.c
M source/blender/bmesh/intern/bmesh_operators.c
M source/blender/bmesh/intern/bmesh_query.c
M source/blender/bmesh/tools/bmesh_beautify.c
M source/blender/collada/AnimationExporter.cpp
M source/blender/collada/AnimationImporter.cpp
M source/blender/collada/ArmatureImporter.cpp
M source/blender/collada/EffectExporter.cpp
M source/blender/collada/collada_utils.h
M source/blender/editors/animation/anim_channels_edit.c
M source/blender/editors/animation/anim_filter.c
M source/blender/editors/armature/meshlaplacian.c
M source/blender/editors/armature/pose_edit.c
M source/blender/editors/curve/editcurve.c
M source/blender/editors/gpencil/editaction_gpencil.c
M source/blender/editors/include/ED_anim_api.h
M source/blender/editors/mesh/mesh_data.c
M source/blender/editors/object/object_constraint.c
M source/blender/editors/object/object_relations.c
M source/blender/editors/object/object_vgroup.c
M source/blender/editors/screen/screen_ops.c
M source/blender/editors/sculpt_paint/paint_image.c
M source/blender/editors/sculpt_paint/paint_image_proj.c
M source/blender/editors/sculpt_paint/sculpt.c
M source/blender/editors/sculpt_paint/sculpt_undo.c
M source/blender/editors/space_console/console_ops.c
M source/blender/editors/space_file/filelist.c
M source/blender/editors/space_image/image_edit.c
M source/blender/editors/space_info/info_report.c
M source/blender/editors/space_node/drawnode.c
M source/blender/editors/space_node/node_edit.c
M source/blender/editors/space_outliner/outliner_edit.c
M source/blender/editors/space_outliner/outliner_tree.c
M source/blender/editors/space_sequencer/sequencer_edit.c
M source/blender/editors/space_sequencer/sequencer_select.c
M source/blender/editors/space_text/text_draw.c
M source/blender/editors/transform/transform.c
M source/blender/editors/uvedit/uvedit_ops.c
M source/blender/editors/uvedit/uvedit_parametrizer.c
M source/blender/freestyle/intern/application/Controller.cpp
M source/blender/freestyle/intern/blender_interface/BlenderFileLoader.cpp
M source/blender/freestyle/intern/geometry/Polygon.h
M source/blender/freestyle/intern/geometry/SweepLine.h
M source/blender/freestyle/intern/geometry/VecMat.h
M source/blender/freestyle/intern/scene_graph/SceneHash.h
M source/blender/freestyle/intern/scene_graph/SceneVisitor.h
M source/blender/freestyle/intern/stroke/BasicStrokeShaders.cpp
M source/blender/freestyle/intern/stroke/Curve.cpp
M source/blender/freestyle/intern/stroke/Operators.cpp
M source/blender/freestyle/intern/stroke/Stroke.cpp
M source/blender/freestyle/intern/stroke/StrokeRep.cpp
M source/blender/freestyle/intern/system/Cast.h
M source/blender/freestyle/intern/system/Id.h
M source/blender/freestyle/intern/system/RenderMonitor.h
M source/blender/freestyle/intern/view_map/FEdgeXDetector.cpp
M source/blender/freestyle/intern/view_map/Silhouette.cpp
M source/blender/freestyle/intern/view_map/SteerableViewMap.cpp
M source/blender/freestyle/intern/view_map/ViewMap.cpp
M source/blender/freestyle/intern/view_map/ViewMapAdvancedIterators.h
M source/blender/freestyle/intern/view_map/ViewMapBuilder.cpp
M source/blender/freestyle/intern/view_map/ViewMapIO.cpp
M source/blender/freestyle/intern/view_map/ViewMapTesselator.h
M source/blender/freestyle/intern/winged_edge/Curvature.cpp
M source/blender/freestyle/intern/winged_edge/WEdge.cpp
M source/blender/freestyle/intern/winged_edge/WEdge.h
M source/blender/freestyle/intern/winged_edge/WXEdge.cpp
M source/blender/freestyle/intern/winged_edge/WXEdge.h
M source/blender/freestyle/intern/winged_edge/WXEdgeBuilder.h
M source/blender/freestyle/intern/winged_edge/WingedEdgeBuilder.cpp
M source/blender/freestyle/intern/winged_edge/WingedEdgeBuilder.h
M source/blender/gpu/intern/gpu_codegen.c
M source/blender/ikplugin/intern/iksolver_plugin.c
M source/blender/imbuf/intern/dds/ColorBlock.cpp
M source/blender/imbuf/intern/filter.c
M source/blender/imbuf/intern/jpeg.c
M source/blender/modifiers/intern/MOD_screw.c
M source/blender/modifiers/intern/MOD_weightvgedit.c
M source/blender/modifiers/intern/MOD_weightvgmix.c
M source/blender/modifiers/intern/MOD_weightvgproximity.c
M source/blender/physics/intern/BPH_mass_spring.cpp
M source/blender/physics/intern/ConstrainedConjugateGradient.h
M source/blender/physics/intern/eigen_utils.h
M source/blender/physics/intern/hair_volume.cpp
M source/blender/physics/intern/implicit_blender.c
M source/blender/physics/intern/implicit_eigen.cpp
M source/blender/python/intern/bpy_rna.c
M source/blender/render/intern/include/texture.h
M source/blender/render/intern/source/multires_bake.c
M source/blender/render/intern/source/pointdensity.c
M source/blender/windowmanager/intern/wm_event_system.c
M source/blender/windowmanager/intern/wm_files.c
M source/blender/windowmanager/intern/wm_gesture.c
M source/blender/windowmanager/intern/wm_init_exit.c
M source/creator/creator_args.c
===================================================================
diff --git a/source/blender/blenkernel/intern/cdderivedmesh.c b/source/blender/blenkernel/intern/cdderivedmesh.c
index 667219e0eec..eb1e8311a12 100644
--- a/source/blender/blenkernel/intern/cdderivedmesh.c
+++ b/source/blender/blenkernel/intern/cdderivedmesh.c
@@ -1173,8 +1173,9 @@ void CDDM_calc_normals(DerivedMesh *dm)
CDDerivedMesh *cddm = (CDDerivedMesh *)dm;
float(*poly_nors)[3];
- if (dm->numVertData == 0)
+ if (dm->numVertData == 0) {
return;
+ }
/* we don't want to overwrite any referenced layers */
cddm->mvert = CustomData_duplicate_referenced_layer(&dm->vertData, CD_MVERT, dm->numVertData);
diff --git a/source/blender/blenkernel/intern/cloth.c b/source/blender/blenkernel/intern/cloth.c
index fcc0e1856af..dc238641a86 100644
--- a/source/blender/blenkernel/intern/cloth.c
+++ b/source/blender/blenkernel/intern/cloth.c
@@ -1732,8 +1732,9 @@ static int cloth_build_springs(ClothModifierData *clmd, Mesh *mesh)
cloth_free_edgelist(edgelist, mvert_num);
#if 0
- if (G.debug_value > 0)
+ if (G.debug_value > 0) {
printf("avg_len: %f\n", clmd->sim_parms->avg_spring_len);
+ }
#endif
return 1;
diff --git a/source/blender/blenkernel/intern/dynamicpaint.c b/source/blender/blenkernel/intern/dynamicpaint.c
index b5242d00ee0..8c6fbe98000 100644
--- a/source/blender/blenkernel/intern/dynamicpaint.c
+++ b/source/blender/blenkernel/intern/dynamicpaint.c
@@ -3081,8 +3081,9 @@ int dynamicPaint_createUVSurface(Scene *scene,
for (int ty = 0; ty < h; ty++) {
for (int tx = 0; tx < w; tx++) {
const int index = tx + w * ty;
- if (tempPoints[index].tri_index != -1)
+ if (tempPoints[index].tri_index != -1) {
tmp[final_index[index]] = index;
+ }
}
}
for (int ty = 0; ty < h; ty++) {
@@ -3193,8 +3194,9 @@ int dynamicPaint_createUVSurface(Scene *scene,
pPoint->alpha = 1.0f;
/* Every pixel that is assigned as "edge pixel" gets blue color */
- if (uvPoint->neighbour_pixel != -1)
+ if (uvPoint->neighbour_pixel != -1) {
pPoint->color[2] = 1.0f;
+ }
/* and every pixel that finally got an polygon gets red color */
/* green color shows pixel face index hash */
if (uvPoint->tri_index != -1) {
diff --git a/source/blender/blenkernel/intern/font.c b/source/blender/blenkernel/intern/font.c
index 70a8f4f124c..3f8fc697c6c 100644
--- a/source/blender/blenkernel/intern/font.c
+++ b/source/blender/blenkernel/intern/font.c
@@ -965,10 +965,12 @@ static bool vfont_to_curve(Object *ob,
/* XXX, has been unused for years, need to check if this is useful, r4613 r5282 - campbell */
#if 0
- if (ascii == '\n')
+ if (ascii == '\n') {
xof = xof_scale;
- else
+ }
+ else {
xof = MARGIN_X_MIN;
+ }
#else
xof = MARGIN_X_MIN;
#endif
diff --git a/source/blender/blenkernel/intern/ipo.c b/source/blender/blenkernel/intern/ipo.c
index 63ef1458de8..34b1f2e1837 100644
--- a/source/blender/blenkernel/intern/ipo.c
+++ b/source/blender/blenkernel/intern/ipo.c
@@ -239,28 +239,34 @@ static const char *ob_adrcodes_to_paths(int adrcode, int *array_index)
return "color";
#if 0
case OB_PD_FSTR:
- if (ob->pd)
+ if (ob->pd) {
poin = &(ob->pd->f_strength);
+ }
break;
case OB_PD_FFALL:
- if (ob->pd)
+ if (ob->pd) {
poin = &(ob->pd->f_power);
+ }
break;
case OB_PD_SDAMP:
- if (ob->pd)
+ if (ob->pd) {
poin = &(ob->pd->pdef_damp);
+ }
break;
case OB_PD_RDAMP:
- if (ob->pd)
+ if (ob->pd) {
poin = &(ob->pd->pdef_rdamp);
+ }
break;
case OB_PD_PERM:
- if (ob->pd)
+ if (ob->pd) {
poin = &(ob->pd->pdef_perm);
+ }
break;
case OB_PD_FMAXD:
- if (ob->pd)
+ if (ob->pd) {
poin = &(ob->pd->maxdist);
+ }
break;
#endif
}
@@ -688,10 +694,12 @@ static const char *camera_adrcodes_to_paths(int adrcode, int *array_index)
case CAM_LENS:
#if 0 /* XXX this cannot be resolved easily... \
* perhaps we assume camera is perspective (works for most cases... */
- if (ca->type == CAM_ORTHO)
+ if (ca->type == CAM_ORTHO) {
return "ortho_scale";
- else
+ }
+ else {
return "lens";
+ }
#else // XXX lazy hack for now...
return "lens";
#endif // XXX this cannot be resolved easily
@@ -884,28 +892,34 @@ static const char *particle_adrcodes_to_paths(int adrcode, int *array_index)
* as the similar object forces */
#if 0
case PART_PD_FSTR:
- if (part->pd)
+ if (part->pd) {
poin = &(part->pd->f_strength);
+ }
break;
case PART_PD_FFALL:
- if (part->pd)
+ if (part->pd) {
poin = &(part->pd->f_power);
+ }
break;
case PART_PD_FMAXD:
- if (part->pd)
+ if (part->pd) {
poin = &(part->pd->maxdist);
+ }
break;
case PART_PD2_FSTR:
- if (part->pd2)
+ if (part->pd2) {
poin = &(part->pd2->f_strength);
+ }
break;
case PART_PD2_FFALL:
- if (part->pd2)
+ if (part->pd2) {
poin = &(part->pd2->f_power);
+ }
break;
case PART_PD2_FMAXD:
- if (part->pd2)
+ if (part->pd2) {
poin = &(part->pd2->maxdist);
+ }
break;
#endif
}
diff --git a/source/blender/blenkernel/intern/library.c b/source/blender/blenkernel/intern/library.c
index 27203158a4f..7ea77ec2849 100644
--- a/source/blender/blenkernel/intern/library.c
+++ b/source/blender/blenkernel/intern/library.c
@@ -1729,8 +1729,9 @@ bool BKE_id_new_name_validate(ListBase *lb, ID *id, const char *tname)
* sorting should not hurt, but noting just incase it alters the way other
* functions work, so sort every time */
#if 0
- if (result)
+ if (result) {
id_sort_by_name(lb, id);
+ }
#endif
id_sort_by_name(lb, id);
diff --git a/source/blender/blenkernel/intern/softbody.c b/source/blender/blenkernel/intern/softbody.c
index 2a3145bee6c..55236bfefd0 100644
--- a/source/blender/blenkernel/intern/softbody.c
+++ b/source/blender/blenkernel/intern/softbody.c
@@ -1860,15 +1860,17 @@ static void dfdx_spring(int ia, int ic, int op, float dir[3], float L, float len
static void dfdx_goal(int ia, int ic, int op, float factor)
{
int i;
- for (i = 0; i < 3; i++)
+ for (i = 0; i < 3; i++) {
EIG_linear_solver_matrix_add(ia + i, op + ic + i, factor);
+ }
}
static void dfdv_goal(int ia, int ic, float factor)
{
int i;
- for (i = 0; i < 3; i++)
+ for (i = 0; i < 3; i++) {
EIG_linear_solver_matrix_add(ia + i, ic + i, factor);
+ }
}
#endif /* if 0 */
@@ -2336,10 +2338,12 @@ static void softbody_apply_forces(Object *ob, float forcetime, int mode, float *
/* old one with homogeneous masses */
/* claim a minimum mass for vertex */
#if 0
- if (sb->nodemass > 0.009999f)
+ if (sb->nodemass > 0.009999f) {
timeovermass = forcetime / sb->nodemass;
- else
+ }
+ else {
timeovermass = forcetime / 0.009999f;
+ }
#endif
for (a = sb->totpoint, bp = sb->bpoint; a > 0; a--, bp++) {
diff --git a/source/blender/blenlib/intern/math_base_inline.c b/source/blender/blenlib/intern/math_base_inline.c
index 221a27f69ed..8f30255a08b 100644
--- a/source/blender/blenlib/intern/math_base_inline.c
+++ b/source/blender/blenlib/intern/math_base_inline.c
@@ -230,23 +230,29 @@ MINLINE unsigned power_of_2_min_u(unsigned x)
#define _round_clamp_fl_impl(arg, ty, min, max) \
{ \
float r = floorf(arg + 0.5f); \
- if (UNLIKELY(r <= (float)min)) \
+ if (UNLIKELY(r <= (float)min)) { \
return (ty)min; \
- else if (UNLIKELY(r >= (float)max)) \
+ } \
+ else if (UNLIKELY(r >= (float)max)) { \
return (ty)max; \
- else \
+ } \
+ else { \
return (ty)r; \
+ } \
}
#define _round_clamp_db_impl(arg, ty, min, max) \
{ \
double r = floor(arg + 0.5); \
- if (UNLIKELY(r <= (double)min)) \
+ if (UNLIKELY(r <= (double)min)) { \
return (ty)min; \
- else if (UNLIKELY(r >= (double)max)) \
+ } \
+ else if (UNLIKELY(r >= (double)max)) { \
return (ty)max; \
- else \
+ } \
+ else { \
return (ty)r; \
+ } \
}
#define _round_fl_impl(arg, ty) \
diff --git a/source/blender/blenlib/intern/math_geom.c b/source/blender/blenlib/intern/math_geom.c
index 898e97613c1..99eee0aa51c 100644
--- a/source/blender/blenlib/intern/math_geom.c
+++ b/source/blender/blenlib/intern/math_geom.c
@@ -1959,16 +1959,18 @@ bool isect_ray_tri_threshold_v3(const float ray_origin[3],
cross_v3_v3v3(p, ray_direction, e2);
a = dot_v3v3(e1, p);
- if ((a > -epsilon) && (a < epsilon))
+ if ((a > -epsilon) && (a < epsilon)) {
return false;
+ }
f = 1.0f / a;
sub_v3_v3v3(s, ray_origin, v0);
cross_v3_v3v3(q, s, e1);
*r_lambda = f * dot_v3v3(e2, q);
- if ((*r_lambda < 0.0f))
+ if ((*r_lambda < 0.0f)) {
return false;
+ }
u = f * dot_v3v3(s, p);
v = f * dot_v3v3(ray_direction, q);
@@ -1979,19 +1981,25 @@ bool isect_ray_tri_threshold_v3(const float ray_origin[3],
dv = v - t;
}
else {
- if (u < 0)
+ if (u < 0) {
du = u;
- else if (u > 1)
+ }
+ else if (u > 1) {
du = u - 1;
- else
+ }
+ else {
du = 0.0f;
+ }
- if (v < 0)
+ if (v < 0) {
dv = v;
- else if (v > 1)
+ }
+ else if (v > 1) {
dv = v - 1;
- else
+ }
+ else {
dv = 0.0f;
+ }
}
mul_v3_fl(e1, du);
diff --git a/source/blender/blenlib/intern/smallhash.c b/source/blender/blenlib/intern/smallhash.c
index ea15c14d3d2..d5fdf003aef 100644
--- a/source/blender/blenlib/intern/smallhash.c
+++ b/source/blender/blenlib/intern/smallhash.c
@@ -372,8 +372,9 @@ void BLI_smallhash_print(SmallHash *sh)
printf("%2x", (uint)sh->buckets[i].key);
}
- if (i != sh->nbuckets - 1)
+ if (i != sh->nbuckets - 1) {
printf(", ");
+ }
c += 6;
diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c
index b2536935663
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list