[Bf-blender-cvs] [909665a0d4e] master: ClangFormat: run with ReflowComments on source/
Campbell Barton
noreply at git.blender.org
Wed May 1 03:33:54 CEST 2019
Commit: 909665a0d4ed23620afc537c583a6e84cdee50b9
Author: Campbell Barton
Date: Wed May 1 11:09:22 2019 +1000
Branches: master
https://developer.blender.org/rB909665a0d4ed23620afc537c583a6e84cdee50b9
ClangFormat: run with ReflowComments on source/
Prepare for enabling ReflowComments.
===================================================================
M source/blender/avi/AVI_avi.h
M source/blender/blenkernel/BKE_particle.h
M source/blender/blenkernel/BKE_pbvh.h
M source/blender/blenkernel/BKE_softbody.h
M source/blender/blenkernel/BKE_unit.h
M source/blender/blenkernel/intern/anim.c
M source/blender/blenkernel/intern/anim_sys.c
M source/blender/blenkernel/intern/appdir.c
M source/blender/blenkernel/intern/boids.c
M source/blender/blenkernel/intern/customdata.c
M source/blender/blenkernel/intern/dynamicpaint.c
M source/blender/blenkernel/intern/editderivedmesh.c
M source/blender/blenkernel/intern/editmesh_tangent.c
M source/blender/blenkernel/intern/effect.c
M source/blender/blenkernel/intern/fmodifier.c
M source/blender/blenkernel/intern/ipo.c
M source/blender/blenkernel/intern/mask.c
M source/blender/blenkernel/intern/mask_rasterize.c
M source/blender/blenkernel/intern/mball_tessellate.c
M source/blender/blenkernel/intern/mesh_evaluate.c
M source/blender/blenkernel/intern/mesh_tangent.c
M source/blender/blenkernel/intern/nla.c
M source/blender/blenkernel/intern/node.c
M source/blender/blenkernel/intern/object_deform.c
M source/blender/blenkernel/intern/ocean.c
M source/blender/blenkernel/intern/packedFile.c
M source/blender/blenkernel/intern/particle.c
M source/blender/blenkernel/intern/particle_system.c
M source/blender/blenkernel/intern/pbvh.c
M source/blender/blenkernel/intern/pointcache.c
M source/blender/blenkernel/intern/seqcache.c
M source/blender/blenkernel/intern/sequencer.c
M source/blender/blenkernel/intern/shrinkwrap.c
M source/blender/blenkernel/intern/smoke.c
M source/blender/blenkernel/intern/softbody.c
M source/blender/blenkernel/intern/studiolight.c
M source/blender/blenkernel/intern/subsurf_ccg.c
M source/blender/blenkernel/intern/suggestions.c
M source/blender/blenkernel/intern/text.c
M source/blender/blenkernel/intern/unit.c
M source/blender/blenkernel/intern/writeffmpeg.c
M source/blender/blenlib/BLI_listbase.h
M source/blender/blenlib/BLI_rect.h
M source/blender/blenlib/intern/DLRB_tree.c
M source/blender/blenlib/intern/freetypefont.c
M source/blender/blenlib/intern/math_geom.c
M source/blender/blenlib/intern/noise.c
M source/blender/blenloader/intern/readfile.c
M source/blender/blenloader/intern/versioning_250.c
M source/blender/blenloader/intern/versioning_260.c
M source/blender/blenloader/intern/versioning_legacy.c
M source/blender/bmesh/intern/bmesh_core.c
M source/blender/bmesh/intern/bmesh_log.c
M source/blender/bmesh/intern/bmesh_mesh.c
M source/blender/bmesh/intern/bmesh_operator_api.h
M source/blender/bmesh/intern/bmesh_operators.c
M source/blender/bmesh/intern/bmesh_polygon.c
M source/blender/bmesh/intern/bmesh_walkers_impl.c
M source/blender/bmesh/operators/bmo_fill_grid.c
M source/blender/bmesh/operators/bmo_removedoubles.c
M source/blender/bmesh/operators/bmo_subdivide.c
M source/blender/bmesh/tools/bmesh_bevel.c
M source/blender/bmesh/tools/bmesh_decimate_collapse.c
M source/blender/bmesh/tools/bmesh_decimate_unsubdivide.c
M source/blender/depsgraph/intern/builder/deg_builder_nodes.cc
M source/blender/depsgraph/intern/builder/deg_builder_pchanmap.cc
M source/blender/depsgraph/intern/depsgraph_query_filter.cc
M source/blender/depsgraph/intern/node/deg_node_component.cc
M source/blender/editors/animation/anim_channels_defines.c
M source/blender/editors/animation/anim_channels_edit.c
M source/blender/editors/animation/anim_deps.c
M source/blender/editors/animation/anim_draw.c
M source/blender/editors/animation/anim_filter.c
M source/blender/editors/animation/anim_markers.c
M source/blender/editors/animation/drivers.c
M source/blender/editors/animation/keyingsets.c
M source/blender/editors/armature/armature_relations.c
M source/blender/editors/armature/meshlaplacian.c
M source/blender/editors/armature/pose_lib.c
M source/blender/editors/armature/pose_slide.c
M source/blender/editors/armature/pose_utils.c
M source/blender/editors/gpencil/annotate_paint.c
M source/blender/editors/gpencil/drawgpencil.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_paint.c
M source/blender/editors/gpencil/gpencil_undo.c
M source/blender/editors/gpencil/gpencil_utils.c
M source/blender/editors/interface/interface.c
M source/blender/editors/interface/interface_handlers.c
M source/blender/editors/interface/interface_layout.c
M source/blender/editors/interface/interface_panel.c
M source/blender/editors/interface/interface_region_search.c
M source/blender/editors/interface/interface_region_tooltip.c
M source/blender/editors/interface/interface_templates.c
M source/blender/editors/interface/interface_widgets.c
M source/blender/editors/io/io_collada.c
M source/blender/editors/mask/mask_ops.c
M source/blender/editors/mask/mask_relationships.c
M source/blender/editors/mesh/editmesh_extrude.c
M source/blender/editors/mesh/editmesh_knife.c
M source/blender/editors/mesh/editmesh_path.c
M source/blender/editors/mesh/editmesh_tools.c
M source/blender/editors/object/object_bake.c
M source/blender/editors/object/object_bake_api.c
M source/blender/editors/object/object_edit.c
M source/blender/editors/object/object_hook.c
M source/blender/editors/object/object_modifier.c
M source/blender/editors/object/object_select.c
M source/blender/editors/object/object_transform.c
M source/blender/editors/object/object_vgroup.c
M source/blender/editors/physics/particle_edit.c
M source/blender/editors/sculpt_paint/paint_image_proj.c
M source/blender/editors/sculpt_paint/sculpt_uv.c
M source/blender/editors/sound/sound_ops.c
M source/blender/editors/space_action/action_edit.c
M source/blender/editors/space_action/action_select.c
M source/blender/editors/space_action/space_action.c
M source/blender/editors/space_console/space_console.c
M source/blender/editors/space_file/fsmenu.c
M source/blender/editors/space_graph/graph_draw.c
M source/blender/editors/space_graph/graph_edit.c
M source/blender/editors/space_graph/space_graph.c
M source/blender/editors/space_image/image_draw.c
M source/blender/editors/space_image/image_ops.c
M source/blender/editors/space_image/space_image.c
M source/blender/editors/space_info/info_draw.c
M source/blender/editors/space_info/space_info.c
M source/blender/editors/space_nla/nla_buttons.c
M source/blender/editors/space_nla/nla_edit.c
M source/blender/editors/space_node/node_draw.c
M source/blender/editors/space_outliner/outliner_draw.c
M source/blender/editors/space_outliner/outliner_tools.c
M source/blender/editors/space_outliner/outliner_tree.c
M source/blender/editors/space_script/space_script.c
M source/blender/editors/space_sequencer/sequencer_add.c
M source/blender/editors/space_sequencer/sequencer_draw.c
M source/blender/editors/space_sequencer/sequencer_intern.h
M source/blender/editors/space_sequencer/sequencer_select.c
M source/blender/editors/space_text/space_text.c
M source/blender/editors/space_text/text_ops.c
M source/blender/editors/space_view3d/view3d_draw_legacy.c
M source/blender/editors/transform/transform.c
M source/blender/editors/transform/transform_conversions.c
M source/blender/editors/transform/transform_ops.c
M source/blender/editors/transform/transform_snap.c
M source/blender/editors/transform/transform_snap_object.c
M source/blender/editors/util/ed_util.c
M source/blender/gpencil_modifiers/intern/MOD_gpencilbuild.c
M source/blender/gpencil_modifiers/intern/MOD_gpencilmirror.c
M source/blender/gpu/intern/gpu_buffers.c
M source/blender/gpu/intern/gpu_shader.c
M source/blender/gpu/intern/gpu_texture.c
M source/blender/imbuf/intern/anim_movie.c
M source/blender/imbuf/intern/dds/DirectDrawSurface.cpp
M source/blender/imbuf/intern/dds/PixelFormat.h
M source/blender/imbuf/intern/openexr/openexr_api.cpp
M source/blender/imbuf/intern/radiance_hdr.c
M source/blender/makesdna/DNA_action_types.h
M source/blender/makesdna/DNA_anim_types.h
M source/blender/makesdna/DNA_boid_types.h
M source/blender/makesdna/DNA_dynamicpaint_types.h
M source/blender/makesdna/DNA_meshdata_types.h
M source/blender/makesdna/DNA_rigidbody_types.h
M source/blender/makesdna/DNA_scene_types.h
M source/blender/makesrna/intern/makesrna.c
M source/blender/makesrna/intern/rna_access.c
M source/blender/makesrna/intern/rna_armature.c
M source/blender/makesrna/intern/rna_main_api.c
M source/blender/makesrna/intern/rna_mask.c
M source/blender/makesrna/intern/rna_userdef.c
M source/blender/nodes/composite/node_composite_util.c
M source/blender/python/intern/bpy_interface.c
M source/blender/python/intern/bpy_rna.c
M source/blender/python/intern/stubs.c
M source/blender/render/intern/source/imagetexture.c
M source/blender/render/intern/source/render_texture.c
M source/blender/windowmanager/intern/wm_event_system.c
M source/blender/windowmanager/intern/wm_operators.c
M source/blender/windowmanager/intern/wm_playanim.c
M source/blender/windowmanager/intern/wm_stereo.c
M source/blender/windowmanager/intern/wm_window.c
M source/blender/windowmanager/wm_cursors.h
===================================================================
diff --git a/source/blender/avi/AVI_avi.h b/source/blender/avi/AVI_avi.h
index 7b7f58506da..e14d947f5dd 100644
--- a/source/blender/avi/AVI_avi.h
+++ b/source/blender/avi/AVI_avi.h
@@ -63,12 +63,18 @@ typedef struct _AviMainHeader {
int MaxBytesPerSec; /* MaxBytesPerSec - approx bps system must handle */
int PaddingGranularity;
int Flags;
-#define AVIF_HASINDEX 0x00000010 /* had idx1 chunk */
-#define AVIF_MUSTUSEINDEX 0x00000020 /* must use idx1 chunk to determine order */
-#define AVIF_ISINTERLEAVED 0x00000100 /* AVI file is interleaved */
+
+ /** had idx1 chunk */
+#define AVIF_HASINDEX 0x00000010
+ /** must use idx1 chunk to determine order */
+#define AVIF_MUSTUSEINDEX 0x00000020
+ /** AVI file is interleaved */
+#define AVIF_ISINTERLEAVED 0x00000100
#define AVIF_TRUSTCKTYPE 0x00000800
-#define AVIF_WASCAPTUREFILE 0x00010000 /* specially allocated used for capturing real time video */
-#define AVIF_COPYRIGHTED 0x00020000 /* contains copyrighted data */
+ /** specially allocated used for capturing real time video */
+#define AVIF_WASCAPTUREFILE 0x00010000
+ /** contains copyrighted data */
+#define AVIF_COPYRIGHTED 0x00020000
int TotalFrames;
int InitialFrames; /* InitialFrames - initial frame before interleaving */
diff --git a/source/blender/blenkernel/BKE_particle.h b/source/blender/blenkernel/BKE_particle.h
index feb40d86151..f9bd722f8ba 100644
--- a/source/blender/blenkernel/BKE_particle.h
+++ b/source/blender/blenkernel/BKE_particle.h
@@ -201,21 +201,24 @@ typedef struct ParticleCollisionElement {
short inv_nor, inside;
} ParticleCollisionElement;
-/* container for moving data between deflet_particle and particle_intersect_face */
+/** Container for moving data between deflet_particle and particle_intersect_face. */
typedef struct ParticleCollision {
struct Object *current;
struct Object *hit;
struct Object *skip[PARTICLE_COLLISION_MAX_COLLISIONS + 1];
struct Object *emitter;
- struct CollisionModifierData *md; // collision modifier for current object;
+ /** Collision modifier for current object. */
+ struct CollisionModifierData *md;
- float f; // time factor of previous collision, needed for substracting face velocity
+ /** Time factor of previous collision, needed for substracting face velocity. */
+ float f;
float fac1, fac2;
float cfra, old_cfra;
- float original_ray_length; //original length of co2-co1, needed for collision time evaluation
+ /** Original length of co2-co1, needed for collision time evaluation. */
+ float original_ray_length;
int skip_count;
diff --git a/source/blender/blenkernel/BKE_pbvh.h b/source/blender/blenkernel/BKE_pbvh.h
index 6df6d36aceb..f59288f54bd 100644
--- a/source/blender/blenkernel/BKE_pbvh.h
+++ b/source/blender/blenkernel/BKE_pbvh.h
@@ -400,8 +400,8 @@ void BKE_pbvh_node_get_bm_orco_data(PBVHNode *node,
bool BKE_pbvh_node_vert_update_check_any(PBVH *bvh, PBVHNode *node);
-//void BKE_pbvh_node_BB_reset(PBVHNode *node);
-//void BKE_pbvh_node_BB_expand(PBVHNode *node, float co[3]);
+// void BKE_pbvh_node_BB_reset(PBVHNode *node);
+// void BKE_pbvh_node_BB_expand(PBVHNode *node, float co[3]);
bool pbvh_has_mask(PBVH *bvh);
void pbvh_show_diffuse_color_set(PBVH *bvh, bool show_diffuse_color);
diff --git a/source/blender/blenkernel/BKE_softbody.h b/source/blender/blenkernel/BKE_softbody.h
index 049950f2a03..e0a8b7f9d5d 100644
--- a/source/blender/blenkernel/BKE_softbody.h
+++ b/source/blender/blenkernel/BKE_softbody.h
@@ -37,8 +37,8 @@ typedef struct BodyPoint {
int *springs;
float choke, choke2, frozen;
float colball;
- short loc_flag; //reserved by locale module specific states
- //char octantflag;
+ short loc_flag; // reserved by locale module specific states
+ // char octantflag;
float mass;
float springweight;
} BodyPoint;
diff --git a/source/blender/blenkernel/BKE_unit.h b/source/blender/blenkernel/BKE_unit.h
index 17973265390..4f9ff61c9a6 100644
--- a/source/blender/blenkernel/BKE_unit.h
+++ b/source/blender/blenkernel/BKE_unit.h
@@ -63,7 +63,7 @@ double bUnit_BaseScalar(int system, int type);
bool bUnit_IsValid(int system, int type);
/* loop over scales, could add names later */
-//double bUnit_Iter(void **unit, char **name, int system, int type);
+// double bUnit_Iter(void **unit, char **name, int system, int type);
void bUnit_GetSystem(int system, int type, void const **r_usys_pt, int *r_len);
int bUnit_GetBaseUnit(const void *usys_pt);
diff --git a/source/blender/blenkernel/intern/anim.c b/source/blender/blenkernel/intern/anim.c
index 7a0c6ca97e8..6b8f8e5303e 100644
--- a/source/blender/blenkernel/intern/anim.c
+++ b/source/blender/blenkernel/intern/anim.c
@@ -480,7 +480,7 @@ int where_on_path(Object *ob,
* which used to temporary set CU_FOLLOW flag for the curve and no
* longer does it (because of threading issues of such a thing.
*/
- //if (cu->flag & CU_FOLLOW) {
+ // if (cu->flag & CU_FOLLOW) {
key_curve_tangent_weights(1.0f - fac, data, KEY_BSPLINE);
diff --git a/source/blender/blenkernel/intern/anim_sys.c b/source/blender/blenkernel/intern/anim_sys.c
index 5bc22197021..cc5cd3b03ae 100644
--- a/source/blender/blenkernel/intern/anim_sys.c
+++ b/source/blender/blenkernel/intern/anim_sys.c
@@ -3906,10 +3906,10 @@ void BKE_animsys_evaluate_all_animation(Main *main,
}
/* macros for less typing
- * - only evaluate animation data for id if it has users (and not just fake ones)
- * - whether animdata exists is checked for by the evaluation function, though taking
- * this outside of the function may make things slightly faster?
- */
+ * - only evaluate animation data for id if it has users (and not just fake ones)
+ * - whether animdata exists is checked for by the evaluation function, though taking
+ * this outside of the function may make things slightly faster?
+ */
#define EVAL_ANIM_IDS(first, aflag) \
for (id = first; id; id = id->next) { \
if (ID_REAL_USERS(id) > 0) { \
@@ -3920,11 +3920,11 @@ void BKE_animsys_evaluate_all_animation(Main *main,
(void)0
/* another macro for the "embedded" nodetree cases
- * - this is like EVAL_ANIM_IDS, but this handles the case "embedded nodetrees"
- * (i.e. scene/material/texture->nodetree) which we need a special exception
- * for, otherwise they'd get skipped
- * - ntp = "node tree parent" = datablock where node tree stuff resides
- */
+ * - this is like EVAL_ANIM_IDS, but this handles the case "embedded nodetrees"
+ * (i.e. scene/material/texture->nodetree) which we need a special exception
+ * for, otherwise they'd get skipped
+ * - ntp = "node tree parent" = datablock where node tree stuff resides
+ */
#define EVAL_ANIM_NODETREE_IDS(first, NtId_Type, aflag) \
for (id = first; id; id = id->next) { \
if (ID_REAL_USERS(id) > 0) { \
@@ -4096,7 +4096,7 @@ void BKE_animsys_eval_driver(Depsgraph *depsgraph,
/* evaluate this using values set already in other places
* NOTE: for 'layering' option later on, we should check if we should remove old value before
* adding new to only be done when drivers only changed */
- //printf("\told val = %f\n", fcu->curval);
+ // printf("\told val = %f\n", fcu->curval);
PathResolvedRNA anim_rna;
if (animsys_store_rna_setting(&id_ptr, fcu->rna_path, fcu->array_index, &anim_rna)) {
diff --git a/source/blender/blenkernel/intern/appdir.c b/source/blender/blenkernel/intern/appdir.c
index 2546937d949..2b4123c74e2 100644
--- a/source/blender/blenkernel/intern/appdir.c
+++ b/source/blender/blenkernel/intern/appdir.c
@@ -157,7 +157,7 @@ static bool test_path(char *targetpath,
#ifdef PATH_DEBUG
printf("\t%s missing: %s\n", __func__, targetpath);
#endif
- //targetpath[0] = '\0';
+ // targetpath[0] = '\0';
return false;
}
}
diff --git a/source/blender/blenkernel/intern/boids.c b/source/blender/blenkernel/intern/boids.c
index fc3e12accea..becef327fab 100644
--- a/source/blender/blenkernel/intern/boids.c
+++ b/source/blender/blenkernel/intern/boids.c
@@ -230,7 +230,7 @@ static int rule_avoid_collision(BoidRule *rule,
int n, neighbors = 0, nearest = 0;
int ret = 0;
- //check deflector objects first
+ // check deflector objects first
if (acbr->options & BRULE_ACOLL_WITH_DEFLECTORS && bbd->sim->colliders) {
ParticleCollision col;
BVHTreeRayHit hit;
@@ -292,7 +292,7 @@ static int rule_avoid_collision(BoidRule *rule,
}
}
- //check boids in own system
+ // check boids in own system
if (acbr->options & BRULE_ACOLL_WITH_BOIDS) {
neighbors = BLI_kdtree_3d_range_search_with_len_squared_cb(bbd->sim->psys->tree,
pa->prev_state.co,
@@ -820,11 +820,11 @@ static boid_rule_cb boid_rules[] = {
rule_follow_leader,
rule_average_speed,
rule_fight,
- //rule_help,
- //rule_protect,
- //rule_hide,
- //rule_follow_path,
- //rule_follow_wall,
+ // rule_help,
+ // rule_protect,
+ // rule_hide,
+ // rule_follow_path,
+ // rule_follow_wall,
};
static void set_boid_values(BoidValues *val, BoidSettings *boids, ParticleData *pa)
@@ -1069,7 +1069,7 @@ static BoidState *get_boid_state(BoidSettings *boids, ParticleData *pa)
return state;
}
-//static int boid_condition_is_true(BoidCondition *cond)
+// static int boid_condition_is_true(BoidCondition *cond)
//{
// /* TODO */
// return 0;
@@ -1085,7 +1085,7 @@ void boid_brain(BoidBrainData *bbd, int p, ParticleData *pa)
BoidParticle *bpa = pa->boid;
ParticleSystem *psys = bbd->sim->psys;
int rand;
- //BoidCondition *cond;
+ // BoidCondition *cond;
if (bpa->data.health <= 0.0f) {
pa->alive = PARS_DYING;
@@ -1093,9 +1093,9 @@ void boid_brain(BoidBrainData *bbd, int p, ParticleData *pa)
return;
}
- //planned for near future
- //cond = state->conditions.first;
- //for (; cond; cond=cond->next) {
+ // planned for near future
+ // cond = state->conditions.first;
+ // for (; cond; cond=cond->next) {
// if (boid_condition_is_true(cond)) {
// pa->boid->state_id = cond->state_id;
// state = g
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list