[Bf-blender-cvs] [35b78d9807c] master: Cleanup: indentation, wrapping
Campbell Barton
noreply at git.blender.org
Thu Mar 14 23:55:57 CET 2019
Commit: 35b78d9807c49ba37e038eda85c672c72dee0247
Author: Campbell Barton
Date: Fri Mar 15 08:53:22 2019 +1100
Branches: master
https://developer.blender.org/rB35b78d9807c49ba37e038eda85c672c72dee0247
Cleanup: indentation, wrapping
Mostly functions wrapping args, not confirming to our style guide.
===================================================================
M source/blender/alembic/intern/abc_curves.cc
M source/blender/alembic/intern/abc_customdata.cc
M source/blender/alembic/intern/abc_mesh.cc
M source/blender/alembic/intern/abc_nurbs.cc
M source/blender/alembic/intern/abc_points.cc
M source/blender/avi/intern/avi_mjpeg.c
M source/blender/blenkernel/BKE_gpencil_modifier.h
M source/blender/blenkernel/intern/customdata.c
M source/blender/blenkernel/intern/dynamicpaint.c
M source/blender/blenkernel/intern/library_query.c
M source/blender/blenkernel/intern/softbody.c
M source/blender/blenkernel/intern/subdiv_converter_mesh.c
M source/blender/blenkernel/intern/tracking_auto.c
M source/blender/blenlib/intern/noise.c
M source/blender/blenloader/intern/readfile.c
M source/blender/bmesh/intern/bmesh_log.c
M source/blender/bmesh/intern/bmesh_mesh.c
M source/blender/bmesh/intern/bmesh_opdefines.c
M source/blender/bmesh/tools/bmesh_bevel.c
M source/blender/collada/AnimationExporter.cpp
M source/blender/collada/AnimationExporter.h
M source/blender/collada/AnimationImporter.h
M source/blender/collada/ArmatureExporter.h
M source/blender/collada/ArmatureImporter.h
M source/blender/collada/BCAnimationSampler.h
M source/blender/collada/BCSampleData.cpp
M source/blender/collada/DocumentImporter.cpp
M source/blender/collada/EffectExporter.cpp
M source/blender/collada/EffectExporter.h
M source/blender/collada/ExtraHandler.h
M source/blender/collada/GeometryExporter.cpp
M source/blender/collada/MeshImporter.h
M source/blender/collada/SceneExporter.cpp
M source/blender/collada/TransformWriter.h
M source/blender/compositor/nodes/COM_OutputFileNode.cpp
M source/blender/depsgraph/intern/builder/deg_builder_nodes.cc
M source/blender/depsgraph/intern/builder/deg_builder_relations.cc
M source/blender/draw/engines/eevee/eevee_volumes.c
M source/blender/draw/engines/gpencil/gpencil_draw_cache_impl.c
M source/blender/draw/engines/gpencil/gpencil_draw_utils.c
M source/blender/draw/engines/gpencil/gpencil_engine.c
M source/blender/draw/engines/gpencil/gpencil_render.c
M source/blender/draw/engines/gpencil/gpencil_shader_fx.c
M source/blender/draw/modes/object_mode.c
M source/blender/editors/animation/anim_channels_edit.c
M source/blender/editors/animation/anim_filter.c
M source/blender/editors/armature/pose_slide.c
M source/blender/editors/gpencil/annotate_draw.c
M source/blender/editors/gpencil/annotate_paint.c
M source/blender/editors/gpencil/drawgpencil.c
M source/blender/editors/gpencil/gpencil_armature.c
M source/blender/editors/gpencil/gpencil_brush.c
M source/blender/editors/gpencil/gpencil_edit.c
M source/blender/editors/gpencil/gpencil_fill.c
M source/blender/editors/gpencil/gpencil_old.c
M source/blender/editors/gpencil/gpencil_paint.c
M source/blender/editors/gpencil/gpencil_primitive.c
M source/blender/editors/gpencil/gpencil_select.c
M source/blender/editors/gpencil/gpencil_utils.c
M source/blender/editors/interface/view2d.c
M source/blender/editors/io/io_collada.c
M source/blender/editors/mesh/editmesh_bevel.c
M source/blender/editors/mesh/editmesh_extrude.c
M source/blender/editors/mesh/editmesh_intersect.c
M source/blender/editors/mesh/editmesh_tools.c
M source/blender/editors/object/object_modifier.c
M source/blender/editors/physics/particle_edit.c
M source/blender/editors/render/render_opengl.c
M source/blender/editors/render/render_shading.c
M source/blender/editors/sculpt_paint/paint_stroke.c
M source/blender/editors/sculpt_paint/paint_vertex.c
M source/blender/editors/sculpt_paint/sculpt.c
M source/blender/editors/space_buttons/buttons_texture.c
M source/blender/editors/space_info/info_stats.c
M source/blender/editors/space_sequencer/sequencer_draw.c
M source/blender/editors/space_view3d/view3d_snap.c
M source/blender/editors/transform/transform.c
M source/blender/editors/transform/transform_conversions.c
M source/blender/freestyle/intern/blender_interface/BlenderStrokeRenderer.h
M source/blender/freestyle/intern/stroke/StrokeRep.h
M source/blender/gpencil_modifiers/intern/MOD_gpencilarray.c
M source/blender/imbuf/intern/anim_movie.c
M source/blender/imbuf/intern/cineon/cineonlib.c
M source/blender/imbuf/intern/indexer.c
M source/blender/makesrna/intern/rna_brush.c
M source/blender/makesrna/intern/rna_gpencil.c
M source/blender/makesrna/intern/rna_gpencil_modifier.c
M source/blender/makesrna/intern/rna_modifier.c
M source/blender/makesrna/intern/rna_nodetree.c
M source/blender/makesrna/intern/rna_scene.c
M source/blender/makesrna/intern/rna_sculpt_paint.c
M source/blender/makesrna/intern/rna_space.c
M source/blender/makesrna/intern/rna_ui_api.c
M source/blender/modifiers/intern/MOD_multires.c
M source/blender/nodes/shader/nodes/node_shader_mixRgb.c
M source/blender/nodes/shader/nodes/node_shader_tangent.c
M source/blender/nodes/shader/nodes/node_shader_vectMath.c
M source/blender/python/bmesh/bmesh_py_types.c
M source/blender/python/mathutils/mathutils_Matrix.c
M source/blender/render/intern/source/bake_api.c
===================================================================
diff --git a/source/blender/alembic/intern/abc_curves.cc b/source/blender/alembic/intern/abc_curves.cc
index 28c0ad05c49..c78f31b671f 100644
--- a/source/blender/alembic/intern/abc_curves.cc
+++ b/source/blender/alembic/intern/abc_curves.cc
@@ -449,10 +449,10 @@ Mesh *AbcCurveReader::read_mesh(Mesh *existing_mesh,
catch(Alembic::Util::Exception &ex) {
*err_str = "Error reading curve sample; more detail on the console";
printf("Alembic: error reading curve sample for '%s/%s' at time %f: %s\n",
- m_iobject.getFullName().c_str(),
- m_curves_schema.getName().c_str(),
- sample_sel.getRequestedTime(),
- ex.what());
+ m_iobject.getFullName().c_str(),
+ m_curves_schema.getName().c_str(),
+ sample_sel.getRequestedTime(),
+ ex.what());
return existing_mesh;
}
diff --git a/source/blender/alembic/intern/abc_customdata.cc b/source/blender/alembic/intern/abc_customdata.cc
index 09875fda6b0..1587f333e3d 100644
--- a/source/blender/alembic/intern/abc_customdata.cc
+++ b/source/blender/alembic/intern/abc_customdata.cc
@@ -157,9 +157,9 @@ static void write_uv(const OCompoundProperty &prop, const CDStreamConfig &config
OV2fGeomParam param(prop, name, true, kFacevaryingScope, 1);
OV2fGeomParam::Sample sample(
- V2fArraySample(&uvs.front(), uvs.size()),
- UInt32ArraySample(&indices.front(), indices.size()),
- kFacevaryingScope);
+ V2fArraySample(&uvs.front(), uvs.size()),
+ UInt32ArraySample(&indices.front(), indices.size()),
+ kFacevaryingScope);
param.set(sample);
}
@@ -205,9 +205,9 @@ static void write_mcol(const OCompoundProperty &prop, const CDStreamConfig &conf
OC4fGeomParam param(prop, name, true, kFacevaryingScope, 1);
OC4fGeomParam::Sample sample(
- C4fArraySample(&buffer.front(), buffer.size()),
- UInt32ArraySample(&indices.front(), indices.size()),
- kVertexScope);
+ C4fArraySample(&buffer.front(), buffer.size()),
+ UInt32ArraySample(&indices.front(), indices.size()),
+ kVertexScope);
param.set(sample);
}
diff --git a/source/blender/alembic/intern/abc_mesh.cc b/source/blender/alembic/intern/abc_mesh.cc
index e7771827b2b..cb22b1eaa04 100644
--- a/source/blender/alembic/intern/abc_mesh.cc
+++ b/source/blender/alembic/intern/abc_mesh.cc
@@ -1101,10 +1101,10 @@ Mesh *AbcMeshReader::read_mesh(Mesh *existing_mesh,
catch(Alembic::Util::Exception &ex) {
*err_str = "Error reading mesh sample; more detail on the console";
printf("Alembic: error reading mesh sample for '%s/%s' at time %f: %s\n",
- m_iobject.getFullName().c_str(),
- m_schema.getName().c_str(),
- sample_sel.getRequestedTime(),
- ex.what());
+ m_iobject.getFullName().c_str(),
+ m_schema.getName().c_str(),
+ sample_sel.getRequestedTime(),
+ ex.what());
return existing_mesh;
}
@@ -1350,10 +1350,10 @@ void AbcSubDReader::readObjectData(Main *bmain, const Alembic::Abc::ISampleSelec
}
catch(Alembic::Util::Exception &ex) {
printf("Alembic: error reading mesh sample for '%s/%s' at time %f: %s\n",
- m_iobject.getFullName().c_str(),
- m_schema.getName().c_str(),
- sample_sel.getRequestedTime(),
- ex.what());
+ m_iobject.getFullName().c_str(),
+ m_schema.getName().c_str(),
+ sample_sel.getRequestedTime(),
+ ex.what());
return;
}
@@ -1398,10 +1398,10 @@ Mesh *AbcSubDReader::read_mesh(Mesh *existing_mesh,
catch(Alembic::Util::Exception &ex) {
*err_str = "Error reading mesh sample; more detail on the console";
printf("Alembic: error reading mesh sample for '%s/%s' at time %f: %s\n",
- m_iobject.getFullName().c_str(),
- m_schema.getName().c_str(),
- sample_sel.getRequestedTime(),
- ex.what());
+ m_iobject.getFullName().c_str(),
+ m_schema.getName().c_str(),
+ sample_sel.getRequestedTime(),
+ ex.what());
return existing_mesh;
}
diff --git a/source/blender/alembic/intern/abc_nurbs.cc b/source/blender/alembic/intern/abc_nurbs.cc
index b0cc9fc2c6b..463396c0b65 100644
--- a/source/blender/alembic/intern/abc_nurbs.cc
+++ b/source/blender/alembic/intern/abc_nurbs.cc
@@ -257,10 +257,10 @@ void AbcNurbsReader::readObjectData(Main *bmain, const Alembic::Abc::ISampleSele
}
catch(Alembic::Util::Exception &ex) {
printf("Alembic: error reading nurbs sample for '%s/%s' at time %f: %s\n",
- m_iobject.getFullName().c_str(),
- schema.getName().c_str(),
- sample_sel.getRequestedTime(),
- ex.what());
+ m_iobject.getFullName().c_str(),
+ schema.getName().c_str(),
+ sample_sel.getRequestedTime(),
+ ex.what());
return;
}
diff --git a/source/blender/alembic/intern/abc_points.cc b/source/blender/alembic/intern/abc_points.cc
index d9b78f83ff5..88154dabeed 100644
--- a/source/blender/alembic/intern/abc_points.cc
+++ b/source/blender/alembic/intern/abc_points.cc
@@ -223,10 +223,10 @@ struct Mesh *AbcPointsReader::read_mesh(struct Mesh *existing_mesh,
catch(Alembic::Util::Exception &ex) {
*err_str = "Error reading points sample; more detail on the console";
printf("Alembic: error reading points sample for '%s/%s' at time %f: %s\n",
- m_iobject.getFullName().c_str(),
- m_schema.getName().c_str(),
- sample_sel.getRequestedTime(),
- ex.what());
+ m_iobject.getFullName().c_str(),
+ m_schema.getName().c_str(),
+ sample_sel.getRequestedTime(),
+ ex.what());
return existing_mesh;
}
diff --git a/source/blender/avi/intern/avi_mjpeg.c b/source/blender/avi/intern/avi_mjpeg.c
index 740f0966141..249cb57afab 100644
--- a/source/blender/avi/intern/avi_mjpeg.c
+++ b/source/blender/avi/intern/avi_mjpeg.c
@@ -337,18 +337,20 @@ void *avi_converter_to_mjpeg(AviMovie *movie, int stream, unsigned char *buffer,
buf = imb_alloc_pixels(movie->header->Height, movie->header->Width, 3, sizeof(unsigned char), "avi.avi_converter_to_mjpeg 1");
if (buf) {
- Compress_JPEG(movie->streams[stream].sh.Quality / 100,
- buf, buffer,
- movie->header->Width,
- movie->header->Height / 2,
- bufsize / 2);
+ Compress_JPEG(
+ movie->streams[stream].sh.Quality / 100,
+ buf, buffer,
+ movie->header->Width,
+ movie->header->Height / 2,
+ bufsize / 2);
*size += numbytes;
numbytes = 0;
- Compress_JPEG(movie->streams[stream].sh.Quality / 100,
- buf + *size, buffer + (size_t)(movie->header->Height / 2) * (size_t)movie->header->Width * 3,
- movie->header->Width,
- movie->header->Height / 2,
- bufsize / 2);
+ Compress_JPEG(
+ movie->streams[stream].sh.Quality / 100,
+ buf + *size, buffer + (size_t)(movie->header->Height / 2) * (size_t)movie->header->Width * 3,
+ movie->header->Width,
+ movie->header->Height / 2,
+ bufsize / 2);
*size += numbytes;
}
}
diff --git a/source/blender/blenkernel/BKE_gpencil_modifier.h b/source/blender/blenkernel/BKE_gpencil_modifier.h
index fe95904722f..585ea18e007 100644
--- a/source/blender/blenkernel/BKE_gpencil_modifier.h
+++ b/source/blender/blenkernel/BKE_gpencil_modifier.h
@@ -164,7 +164,7 @@ typedef struct GpencilModifierTypeInfo {
* This function is optional.
*/
int (*remapTime)(struct GpencilModifierData *md, struct Depsgraph *depsgraph,
- struct Scene *scene, struct Object *ob, struct bGPDlayer *gpl, int cfra);
+ struct Scene *scene, struct Object *ob, struct bGPDlayer *gpl, int cfra);
/**
* Initialize new instance data for this modifier type, this function
diff --git a/source/blender/blenkernel/intern/customdata.c b/source/blender/blenkernel/intern/customdata.c
index 56847aded8b..cdb905f9e35 100644
--- a/source/blender/blenkernel/intern/customdata.c
+++ b/source/blender/blenkernel/intern/customdata.c
@@ -2319,8 +2319,8 @@ static void CustomData_copy_data_layer(
if (!count || !src_data || !dst_data) {
if (count && !(src_data == NULL && dst_data == NULL)) {
CLOG_WARN(&LOG, "null data for %s type (%p --> %p), skipping",
- layerType_getName(source->layers[src_i].type),
- (void *)src_data, (void *)dst_data);
+ layerType_getName(source->layers[src_i].type),
+ (void *)src_data, (void *)dst_data);
}
return;
}
diff --git a/source/blender/blenkernel/intern/dynamicpaint.c b/source/blender/blenkernel/intern/dynamicpaint.c
index daadc2e1fad..eeaf0710a5f 100644
--- a/source/blender/blenkernel/intern/dynamicpaint.c
+++ b/source/blender/blenkernel/intern/dynamicpaint.c
@@ -2402,13 +2402,14 @@ static float dist_squared_to_looptri_uv_edges(const MLoopTri *mlooptri, const ML
for (int i = 0; i < 3; i++) {
const float dist_squared = dist_squared_to_line_segment_v2(
- point,
- mloopuv[mlooptri[tri_index].tri[(i + 0)]].uv,
- mloopuv[mlooptri[tri_index].tri[(i + 1) % 3]].uv
+ point,
+ mloopuv[mlooptri[tri_index].tri[(i + 0)]].uv,
+ mloopuv[mlooptri[tri_index].tri[(i + 1) % 3]].uv
);
- if (dist_squared < min_distance)
+ if (dist_squared < min_distance) {
min_distance = dist_squared;
+ }
}
return min_distance;
diff --git a/source/blender/blenkernel/intern/library_query.c b/source/blender/blenkernel/intern/library_query.c
index 267699b67c1..72e9d747206 100644
--- a/source/blender/blenkernel/intern/library_query.c
+++ b/source/blender/blenkernel/intern/library_query.c
@@ -1204,9 +1204,9 @@ static int foreach_libblock_id_users_callback(void *user_data, ID *UNUSED(self_i
if (*id_p == iter->id) {
#if 0
printf("%s uses %s (refcounted: %d, userone: %d, used_one: %d, used_one_active: %d, indirect_usage: %d)\n",
- iter->curr_id->name, iter->id->name, (cb_flag & IDWALK_USER) ? 1 : 0, (cb_flag & IDWALK_USER_ONE) ? 1 : 0,
- (iter->id->tag & LIB_TAG_EXTRAUSER) ? 1 : 0, (iter->id->tag & LIB_TAG_EXTRAUSER_SET) ? 1 : 0,
- (cb_flag & IDWALK_INDIRECT_USAGE) ? 1 : 0);
+ iter->curr_id->name, iter->id->name, (cb_flag & IDWALK_USER) ? 1 : 0, (cb_flag & IDWALK_USER_ONE) ? 1 : 0,
+ (iter->id->tag & LIB_TAG_EXTRAUSER) ? 1 : 0, (iter->id->
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list