From 909665a0d4ed23620afc537c583a6e84cdee50b9 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Wed, 1 May 2019 11:09:22 +1000 Subject: ClangFormat: run with ReflowComments on source/ Prepare for enabling ReflowComments. --- source/blender/blenkernel/BKE_particle.h | 11 +++--- source/blender/blenkernel/BKE_pbvh.h | 4 +-- source/blender/blenkernel/BKE_softbody.h | 4 +-- source/blender/blenkernel/BKE_unit.h | 2 +- source/blender/blenkernel/intern/anim.c | 2 +- source/blender/blenkernel/intern/anim_sys.c | 20 +++++------ source/blender/blenkernel/intern/appdir.c | 2 +- source/blender/blenkernel/intern/boids.c | 42 +++++++++++----------- source/blender/blenkernel/intern/customdata.c | 6 ++-- source/blender/blenkernel/intern/dynamicpaint.c | 4 +-- source/blender/blenkernel/intern/editderivedmesh.c | 2 +- .../blender/blenkernel/intern/editmesh_tangent.c | 8 ++--- source/blender/blenkernel/intern/effect.c | 2 +- source/blender/blenkernel/intern/fmodifier.c | 2 +- source/blender/blenkernel/intern/ipo.c | 18 +++++----- source/blender/blenkernel/intern/mask.c | 2 +- source/blender/blenkernel/intern/mask_rasterize.c | 4 +-- .../blender/blenkernel/intern/mball_tessellate.c | 9 ++++- source/blender/blenkernel/intern/mesh_evaluate.c | 4 +-- source/blender/blenkernel/intern/mesh_tangent.c | 8 ++--- source/blender/blenkernel/intern/nla.c | 4 +-- source/blender/blenkernel/intern/node.c | 4 +-- source/blender/blenkernel/intern/object_deform.c | 4 +-- source/blender/blenkernel/intern/ocean.c | 8 ++--- source/blender/blenkernel/intern/packedFile.c | 8 ++--- source/blender/blenkernel/intern/particle.c | 14 ++++---- source/blender/blenkernel/intern/particle_system.c | 10 +++--- source/blender/blenkernel/intern/pbvh.c | 4 +-- source/blender/blenkernel/intern/pointcache.c | 6 ++-- source/blender/blenkernel/intern/seqcache.c | 4 +-- source/blender/blenkernel/intern/sequencer.c | 6 ++-- source/blender/blenkernel/intern/shrinkwrap.c | 18 +++++----- source/blender/blenkernel/intern/smoke.c | 2 +- source/blender/blenkernel/intern/softbody.c | 20 +++++------ source/blender/blenkernel/intern/studiolight.c | 3 +- source/blender/blenkernel/intern/subsurf_ccg.c | 2 +- source/blender/blenkernel/intern/suggestions.c | 2 +- source/blender/blenkernel/intern/text.c | 6 ++-- source/blender/blenkernel/intern/unit.c | 19 +++++----- source/blender/blenkernel/intern/writeffmpeg.c | 7 ++-- 40 files changed, 160 insertions(+), 147 deletions(-) (limited to 'source/blender/blenkernel') 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 = get_boid_state(boids, pa); @@ -1420,7 +1420,7 @@ void boid_body(BoidBrainData *bbd, ParticleData *pa) madd_v3_v3fl(pa->state.vel, acc, dtime); - //if (bpa->data.mode != eBoidMode_InAir) + // if (bpa->data.mode != eBoidMode_InAir) bpa->ground = boid_find_ground(bbd, pa, ground_co, ground_nor); /* change modes, constrain movement & keep track of down vector */ @@ -1506,20 +1506,20 @@ void boid_body(BoidBrainData *bbd, ParticleData *pa) } case eBoidMode_Climbing: { boid_climb(boids, pa, ground_co, ground_nor); - //float nor[3]; - //copy_v3_v3(nor, ground_nor); + // float nor[3]; + // copy_v3_v3(nor, ground_nor); ///* gather apparent gravity to r_ve */ - //madd_v3_v3fl(pa->r_ve, ground_nor, -1.0); - //normalize_v3(pa->r_ve); + // madd_v3_v3fl(pa->r_ve, ground_nor, -1.0); + // normalize_v3(pa->r_ve); ///* raise boid it's size from surface */ - //mul_v3_fl(nor, pa->size * boids->height); - //add_v3_v3v3(pa->state.co, ground_co, nor); + // mul_v3_fl(nor, pa->size * boids->height); + // add_v3_v3v3(pa->state.co, ground_co, nor); ///* remove normal component from velocity */ - //project_v3_v3v3(v, pa->state.vel, ground_nor); - //sub_v3_v3v3(pa->state.vel, pa->state.vel, v); + // project_v3_v3v3(v, pa->state.vel, ground_nor); + // sub_v3_v3v3(pa->state.vel, pa->state.vel, v); break; } case eBoidMode_OnLand: { diff --git a/source/blender/blenkernel/intern/customdata.c b/source/blender/blenkernel/intern/customdata.c index 11af695c690..22bc44a88d8 100644 --- a/source/blender/blenkernel/intern/customdata.c +++ b/source/blender/blenkernel/intern/customdata.c @@ -4464,7 +4464,7 @@ void CustomData_external_remove(CustomData *data, ID *id, int type, int totelem) { CustomDataExternal *external = data->external; CustomDataLayer *layer; - //char filename[FILE_MAX]; + // char filename[FILE_MAX]; int layer_index; // i, remove_file; layer_index = CustomData_get_active_layer_index(data, type); @@ -4526,7 +4526,7 @@ static void copy_bit_flag(void *dst, const void *src, const size_t data_size, co COPY_BIT_FLAG(uint64_t, dst, src, flag); break; default: - //CLOG_ERROR(&LOG, "Unknown flags-container size (%zu)", datasize); + // CLOG_ERROR(&LOG, "Unknown flags-container size (%zu)", datasize); break; } @@ -4545,7 +4545,7 @@ static bool check_bit_flag(const void *data, const size_t data_size, const uint6 case 8: return ((*((uint64_t *)data) & ((uint64_t)flag)) != 0); default: - //CLOG_ERROR(&LOG, "Unknown flags-container size (%zu)", datasize); + // CLOG_ERROR(&LOG, "Unknown flags-container size (%zu)", datasize); return false; } } diff --git a/source/blender/blenkernel/intern/dynamicpaint.c b/source/blender/blenkernel/intern/dynamicpaint.c index a6a87b302ab..0ee32af336d 100644 --- a/source/blender/blenkernel/intern/dynamicpaint.c +++ b/source/blender/blenkernel/intern/dynamicpaint.c @@ -2008,7 +2008,7 @@ static Mesh *dynamicPaint_Modifier_apply(DynamicPaintModifierData *pmd, Object * MEM_freeN(fcolor); /* Mark tessellated CD layers as dirty. */ - //result->dirty |= DM_DIRTY_TESS_CDLAYERS; + // result->dirty |= DM_DIRTY_TESS_CDLAYERS; } /* vertex group paint */ else if (surface->type == MOD_DPAINT_SURFACE_T_WEIGHT) { @@ -2066,7 +2066,7 @@ static Mesh *dynamicPaint_Modifier_apply(DynamicPaintModifierData *pmd, Object * } if (update_normals) { - //result->dirty |= DM_DIRTY_NORMALS; + // result->dirty |= DM_DIRTY_NORMALS; } } /* make a copy of mesh to use as brush data */ diff --git a/source/blender/blenkernel/intern/editderivedmesh.c b/source/blender/blenkernel/intern/editderivedmesh.c index 794b1d669d2..06f297b23e0 100644 --- a/source/blender/blenkernel/intern/editderivedmesh.c +++ b/source/blender/blenkernel/intern/editderivedmesh.c @@ -399,7 +399,7 @@ static void statvis_calc_sharp(BMEditMesh *em, BMIter iter; BMesh *bm = em->bm; BMEdge *e; - //float f_no[3]; + // float f_no[3]; const float minmax_irange = 1.0f / (max - min); int i; diff --git a/source/blender/blenkernel/intern/editmesh_tangent.c b/source/blender/blenkernel/intern/editmesh_tangent.c index 2b26d814b70..df2fb8c8348 100644 --- a/source/blender/blenkernel/intern/editmesh_tangent.c +++ b/source/blender/blenkernel/intern/editmesh_tangent.c @@ -104,7 +104,7 @@ static void emdm_ts_GetPosition(const SMikkTSpaceContext *pContext, const int face_num, const int vert_index) { - //assert(vert_index >= 0 && vert_index < 4); + // assert(vert_index >= 0 && vert_index < 4); SGLSLEditMeshToTangent *pMesh = pContext->m_pUserData; const BMLoop **lt; const BMLoop *l; @@ -138,7 +138,7 @@ static void emdm_ts_GetTextureCoordinate(const SMikkTSpaceContext *pContext, const int face_num, const int vert_index) { - //assert(vert_index >= 0 && vert_index < 4); + // assert(vert_index >= 0 && vert_index < 4); SGLSLEditMeshToTangent *pMesh = pContext->m_pUserData; const BMLoop **lt; const BMLoop *l; @@ -176,7 +176,7 @@ static void emdm_ts_GetNormal(const SMikkTSpaceContext *pContext, const int face_num, const int vert_index) { - //assert(vert_index >= 0 && vert_index < 4); + // assert(vert_index >= 0 && vert_index < 4); SGLSLEditMeshToTangent *pMesh = pContext->m_pUserData; const BMLoop **lt; const BMLoop *l; @@ -221,7 +221,7 @@ static void emdm_ts_SetTSpace(const SMikkTSpaceContext *pContext, const int face_num, const int vert_index) { - //assert(vert_index >= 0 && vert_index < 4); + // assert(vert_index >= 0 && vert_index < 4); SGLSLEditMeshToTangent *pMesh = pContext->m_pUserData; const BMLoop **lt; const BMLoop *l; diff --git a/source/blender/blenkernel/intern/effect.c b/source/blender/blenkernel/intern/effect.c index 1c023c59d50..51715c3a223 100644 --- a/source/blender/blenkernel/intern/effect.c +++ b/source/blender/blenkernel/intern/effect.c @@ -698,7 +698,7 @@ int get_effector_data(EffectorCache *eff, ret = psys_get_particle_state(&sim, *efd->index, &state, 0); /* TODO */ - //if (eff->pd->forcefiled == PFIELD_HARMONIC && ret==0) { + // if (eff->pd->forcefiled == PFIELD_HARMONIC && ret==0) { // if (pa->dietime < eff->psys->cfra) // eff->flag |= PE_VELOCITY_TO_IMPULSE; //} diff --git a/source/blender/blenkernel/intern/fmodifier.c b/source/blender/blenkernel/intern/fmodifier.c index 234fa607604..c6188642e41 100644 --- a/source/blender/blenkernel/intern/fmodifier.c +++ b/source/blender/blenkernel/intern/fmodifier.c @@ -894,7 +894,7 @@ static void fcm_python_evaluate(FCurve *UNUSED(fcu), void *UNUSED(storage)) { #ifdef WITH_PYTHON - //FMod_Python *data = (FMod_Python *)fcm->data; + // FMod_Python *data = (FMod_Python *)fcm->data; /* FIXME... need to implement this modifier... * It will need it execute a script using the custom properties diff --git a/source/blender/blenkernel/intern/ipo.c b/source/blender/blenkernel/intern/ipo.c index a05fbe5d77b..63ef1458de8 100644 --- a/source/blender/blenkernel/intern/ipo.c +++ b/source/blender/blenkernel/intern/ipo.c @@ -511,10 +511,10 @@ static const char *texture_adrcodes_to_paths(int adrcode, int *array_index) return "turbulence"; case TE_NDEPTH: // XXX texture RNA undefined - //poin= &(tex->noisedepth); *type= IPO_SHORT; break; + // poin= &(tex->noisedepth); *type= IPO_SHORT; break; break; case TE_NTYPE: // XXX texture RNA undefined - //poin= &(tex->noisetype); *type= IPO_SHORT; break; + // poin= &(tex->noisetype); *type= IPO_SHORT; break; break; case TE_N_BAS1: @@ -686,7 +686,7 @@ static const char *camera_adrcodes_to_paths(int adrcode, int *array_index) /* result depends on adrcode */ switch (adrcode) { case CAM_LENS: -#if 0 /* XXX this cannot be resolved easily... +#if 0 /* XXX this cannot be resolved easily... \ * perhaps we assume camera is perspective (works for most cases... */ if (ca->type == CAM_ORTHO) return "ortho_scale"; @@ -1001,7 +1001,7 @@ static char *get_rna_access(ID *id, /* XXX problematic blocktypes */ case ID_SEQ: /* sequencer strip */ - //SEQ_FAC1: + // SEQ_FAC1: switch (adrcode) { case SEQ_FAC1: propname = "effect_fader"; @@ -1444,8 +1444,8 @@ static void icu_to_fcurves(ID *id, else if (icu->bp) { /* TODO: need to convert from BPoint type to the more compact FPoint type... * but not priority, since no data used this. */ - //BPoint *bp; - //FPoint *fpt; + // BPoint *bp; + // FPoint *fpt; } /* add new F-Curve to list */ @@ -1506,7 +1506,7 @@ static void icu_to_fcurves(ID *id, */ if (((icu->blocktype == ID_OB) && ELEM(icu->adrcode, OB_ROT_X, OB_ROT_Y, OB_ROT_Z)) || ((icu->blocktype == ID_PO) && ELEM(icu->adrcode, AC_EUL_X, AC_EUL_Y, AC_EUL_Z))) { - const float fac = (float)M_PI / 18.0f; //10.0f * M_PI/180.0f; + const float fac = (float)M_PI / 18.0f; // 10.0f * M_PI/180.0f; dst->vec[0][1] *= fac; dst->vec[1][1] *= fac; @@ -1566,8 +1566,8 @@ static void icu_to_fcurves(ID *id, else if (icu->bp) { /* TODO: need to convert from BPoint type to the more compact FPoint type... * but not priority, since no data used this */ - //BPoint *bp; - //FPoint *fpt; + // BPoint *bp; + // FPoint *fpt; } /* add new F-Curve to list */ diff --git a/source/blender/blenkernel/intern/mask.c b/source/blender/blenkernel/intern/mask.c index 3a7bc76344a..9a9b3757ef2 100644 --- a/source/blender/blenkernel/intern/mask.c +++ b/source/blender/blenkernel/intern/mask.c @@ -1228,7 +1228,7 @@ static void mask_calc_point_handle(MaskSplinePoint *point, { BezTriple *bezt = &point->bezt; BezTriple *bezt_prev = NULL, *bezt_next = NULL; - //int handle_type = bezt->h1; + // int handle_type = bezt->h1; if (point_prev) { bezt_prev = &point_prev->bezt; diff --git a/source/blender/blenkernel/intern/mask_rasterize.c b/source/blender/blenkernel/intern/mask_rasterize.c index bd7a9c10ffa..fe6ef2e047d 100644 --- a/source/blender/blenkernel/intern/mask_rasterize.c +++ b/source/blender/blenkernel/intern/mask_rasterize.c @@ -1249,7 +1249,7 @@ static float maskrasterize_layer_z_depth_quad( { float w[4]; barycentric_weights_v2_quad(v1, v2, v3, v4, pt, w); - //return (v1[2] * w[0]) + (v2[2] * w[1]) + (v3[2] * w[2]) + (v4[2] * w[3]); + // return (v1[2] * w[0]) + (v2[2] * w[1]) + (v3[2] * w[2]) + (v4[2] * w[3]); return w[2] + w[3]; /* we can make this assumption for small speedup */ } @@ -1287,7 +1287,7 @@ static float maskrasterize_layer_isect(unsigned int *face, /* needs work */ #if 1 /* quad check fails for bow-tie, so keep using 2 tri checks */ - //if (isect_point_quad_v2(xy, cos[face[0]], cos[face[1]], cos[face[2]], cos[face[3]])) + // if (isect_point_quad_v2(xy, cos[face[0]], cos[face[1]], cos[face[2]], cos[face[3]])) if (isect_point_tri_v2(xy, cos[face[0]], cos[face[1]], cos[face[2]]) || isect_point_tri_v2(xy, cos[face[0]], cos[face[2]], cos[face[3]])) { return maskrasterize_layer_z_depth_quad( diff --git a/source/blender/blenkernel/intern/mball_tessellate.c b/source/blender/blenkernel/intern/mball_tessellate.c index 60813e927bb..1218e78c6f0 100644 --- a/source/blender/blenkernel/intern/mball_tessellate.c +++ b/source/blender/blenkernel/intern/mball_tessellate.c @@ -1291,7 +1291,14 @@ static void init_meta(Depsgraph *depsgraph, PROCESS *process, Scene *scene, Obje /* Rotation of MetaElem is stored in quat */ quat_to_mat4(rot, ml->quat); - /* basis object space -> world -> ml object space -> position -> rotation -> ml local space */ + /* Matrix multiply is as follows: + * basis object space -> + * world -> + * ml object space -> + * position -> + * rotation -> + * ml local space + */ mul_m4_series((float(*)[4])new_ml->mat, obinv, bob->obmat, pos, rot); /* ml local space -> basis object space */ invert_m4_m4((float(*)[4])new_ml->imat, (float(*)[4])new_ml->mat); diff --git a/source/blender/blenkernel/intern/mesh_evaluate.c b/source/blender/blenkernel/intern/mesh_evaluate.c index 903803d83c3..d889fca3a3a 100644 --- a/source/blender/blenkernel/intern/mesh_evaluate.c +++ b/source/blender/blenkernel/intern/mesh_evaluate.c @@ -1312,11 +1312,11 @@ static void split_loop_nor_fan_do(LoopSplitTaskDataCommon *common_data, LoopSpli printf("Invalid clnors in this fan!\n"); } while ((clnor = BLI_SMALLSTACK_POP(clnors))) { - //print_v2("org clnor", clnor); + // print_v2("org clnor", clnor); clnor[0] = (short)clnors_avg[0]; clnor[1] = (short)clnors_avg[1]; } - //print_v2("new clnors", clnors_avg); + // print_v2("new clnors", clnors_avg); } /* Extra bonus: since smallstack is local to this func, * no more need to empty it at all cost! */ diff --git a/source/blender/blenkernel/intern/mesh_tangent.c b/source/blender/blenkernel/intern/mesh_tangent.c index 8ed7f313e3d..19d94be9b6e 100644 --- a/source/blender/blenkernel/intern/mesh_tangent.c +++ b/source/blender/blenkernel/intern/mesh_tangent.c @@ -285,7 +285,7 @@ static void dm_ts_GetPosition(const SMikkTSpaceContext *pContext, const int face_num, const int vert_index) { - //assert(vert_index >= 0 && vert_index < 4); + // assert(vert_index >= 0 && vert_index < 4); SGLSLMeshToTangent *pMesh = pContext->m_pUserData; const MLoopTri *lt; uint loop_index; @@ -319,7 +319,7 @@ static void dm_ts_GetTextureCoordinate(const SMikkTSpaceContext *pContext, const int face_num, const int vert_index) { - //assert(vert_index >= 0 && vert_index < 4); + // assert(vert_index >= 0 && vert_index < 4); SGLSLMeshToTangent *pMesh = pContext->m_pUserData; const MLoopTri *lt; uint loop_index; @@ -358,7 +358,7 @@ static void dm_ts_GetNormal(const SMikkTSpaceContext *pContext, const int face_num, const int vert_index) { - //assert(vert_index >= 0 && vert_index < 4); + // assert(vert_index >= 0 && vert_index < 4); SGLSLMeshToTangent *pMesh = (SGLSLMeshToTangent *)pContext->m_pUserData; const MLoopTri *lt; uint loop_index; @@ -421,7 +421,7 @@ static void dm_ts_SetTSpace(const SMikkTSpaceContext *pContext, const int face_num, const int vert_index) { - //assert(vert_index >= 0 && vert_index < 4); + // assert(vert_index >= 0 && vert_index < 4); SGLSLMeshToTangent *pMesh = (SGLSLMeshToTangent *)pContext->m_pUserData; const MLoopTri *lt; uint loop_index; diff --git a/source/blender/blenkernel/intern/nla.c b/source/blender/blenkernel/intern/nla.c index 121ec1d4391..15e53e12ece 100644 --- a/source/blender/blenkernel/intern/nla.c +++ b/source/blender/blenkernel/intern/nla.c @@ -90,7 +90,7 @@ void BKE_nlastrip_free(ListBase *strips, NlaStrip *strip, bool do_id_user) } /* free remapping info */ - //if (strip->remap) + // if (strip->remap) // BKE_animremap_free(); /* free own F-Curves */ @@ -547,7 +547,7 @@ float nlastrip_get_frame(NlaStrip *strip, float cframe, short mode) { switch (strip->type) { case NLASTRIP_TYPE_META: /* Meta - for now, does the same as transition - * (is really just an empty container). */ + * (is really just an empty container). */ case NLASTRIP_TYPE_TRANSITION: /* transition */ return nlastrip_get_frame_transition(strip, cframe, mode); diff --git a/source/blender/blenkernel/intern/node.c b/source/blender/blenkernel/intern/node.c index b35e88f5036..3adb6cfe960 100644 --- a/source/blender/blenkernel/intern/node.c +++ b/source/blender/blenkernel/intern/node.c @@ -1748,9 +1748,9 @@ void BKE_node_preview_set_pixel( rgba_float_to_uchar(tar, col); } } - //else printf("prv out bound x y %d %d\n", x, y); + // else printf("prv out bound x y %d %d\n", x, y); } - //else printf("prv out bound x y %d %d\n", x, y); + // else printf("prv out bound x y %d %d\n", x, y); } } diff --git a/source/blender/blenkernel/intern/object_deform.c b/source/blender/blenkernel/intern/object_deform.c index 704e6886f27..0ce6094771c 100644 --- a/source/blender/blenkernel/intern/object_deform.c +++ b/source/blender/blenkernel/intern/object_deform.c @@ -578,7 +578,7 @@ bool *BKE_object_defgroup_lock_flags_get(Object *ob, const int defbase_tot) { bool is_locked = false; int i; - //int defbase_tot = BLI_listbase_count(&ob->defbase); + // int defbase_tot = BLI_listbase_count(&ob->defbase); bool *lock_flags = MEM_mallocN(defbase_tot * sizeof(bool), "defflags"); bDeformGroup *defgroup; @@ -602,7 +602,7 @@ bool *BKE_object_defgroup_validmap_get(Object *ob, const int defbase_tot) bool *defgroup_validmap; GHash *gh; int i, step1 = 1; - //int defbase_tot = BLI_listbase_count(&ob->defbase); + // int defbase_tot = BLI_listbase_count(&ob->defbase); VirtualModifierData virtualModifierData; if (BLI_listbase_is_empty(&ob->defbase)) { diff --git a/source/blender/blenkernel/intern/ocean.c b/source/blender/blenkernel/intern/ocean.c index 02fec32b207..b5df7d5fe9b 100644 --- a/source/blender/blenkernel/intern/ocean.c +++ b/source/blender/blenkernel/intern/ocean.c @@ -1377,7 +1377,7 @@ void BKE_ocean_bake(struct Ocean *o, int res_x = och->resolution_x; int res_y = och->resolution_y; char string[FILE_MAX]; - //RNG *rng; + // RNG *rng; if (!o) { return; @@ -1390,7 +1390,7 @@ void BKE_ocean_bake(struct Ocean *o, prev_foam = NULL; } - //rng = BLI_rng_new(0); + // rng = BLI_rng_new(0); /* setup image format */ imf.imtype = R_IMF_IMTYPE_OPENEXR; @@ -1497,12 +1497,12 @@ void BKE_ocean_bake(struct Ocean *o, if (prev_foam) { MEM_freeN(prev_foam); } - //BLI_rng_free(rng); + // BLI_rng_free(rng); return; } } - //BLI_rng_free(rng); + // BLI_rng_free(rng); if (prev_foam) { MEM_freeN(prev_foam); } diff --git a/source/blender/blenkernel/intern/packedFile.c b/source/blender/blenkernel/intern/packedFile.c index ab2ce2ec8ba..dd91878a15b 100644 --- a/source/blender/blenkernel/intern/packedFile.c +++ b/source/blender/blenkernel/intern/packedFile.c @@ -181,7 +181,7 @@ PackedFile *newPackedFile(ReportList *reports, const char *filename, const char return NULL; } - //XXX waitcursor(1); + // XXX waitcursor(1); /* convert relative filenames to absolute filenames */ @@ -216,7 +216,7 @@ PackedFile *newPackedFile(ReportList *reports, const char *filename, const char close(file); } - //XXX waitcursor(0); + // XXX waitcursor(0); return (pf); } @@ -281,7 +281,7 @@ int writePackedFile(ReportList *reports, /* void *data; */ if (guimode) { - } //XXX waitcursor(1); + } // XXX waitcursor(1); BLI_strncpy(name, filename, sizeof(name)); BLI_path_abs(name, ref_file_name); @@ -336,7 +336,7 @@ int writePackedFile(ReportList *reports, } if (guimode) { - } //XXX waitcursor(0); + } // XXX waitcursor(0); return (ret_value); } diff --git a/source/blender/blenkernel/intern/particle.c b/source/blender/blenkernel/intern/particle.c index 63ff11e8eea..c6cc72ba989 100644 --- a/source/blender/blenkernel/intern/particle.c +++ b/source/blender/blenkernel/intern/particle.c @@ -1546,7 +1546,7 @@ int psys_particle_dm_face_lookup(Mesh *mesh_final, if (osface_final == NULL) { /* Assume we don't need osface_final data, and we get a direct 1-1 mapping... */ if (findex_orig < totface_final) { - //printf("\tNO CD_ORIGSPACE, assuming not needed\n"); + // printf("\tNO CD_ORIGSPACE, assuming not needed\n"); return findex_orig; } else { @@ -2099,7 +2099,7 @@ int do_guides(Depsgraph *depsgraph, add_v3_v3(vec_to_point, guidevec); - //sub_v3_v3v3(pa_loc, pa_loc, pa_zero); + // sub_v3_v3v3(pa_loc, pa_loc, pa_zero); madd_v3_v3fl(effect, vec_to_point, data->strength); madd_v3_v3fl(veffect, guidedir, data->strength); totstrength += data->strength; @@ -2115,7 +2115,7 @@ int do_guides(Depsgraph *depsgraph, mul_v3_fl(effect, 1.0f / totstrength); } CLAMP(totstrength, 0.0f, 1.0f); - //add_v3_v3(effect, pa_zero); + // add_v3_v3(effect, pa_zero); interp_v3_v3v3(state->co, state->co, effect, totstrength); normalize_v3(veffect); @@ -4338,7 +4338,7 @@ void psys_get_particle_on_path(ParticleSimulationData *sim, } } else if (totchild) { - //invert_m4_m4(imat, ob->obmat); + // invert_m4_m4(imat, ob->obmat); /* interpolate childcache directly if it exists */ if (psys->childcache) { @@ -4384,9 +4384,9 @@ void psys_get_particle_on_path(ParticleSimulationData *sim, /* We need to save the actual root position of the child for * positioning it accurately to the surface of the emitter. */ - //copy_v3_v3(cpa_1st, co); + // copy_v3_v3(cpa_1st, co); - //mul_m4_v3(ob->obmat, cpa_1st); + // mul_m4_v3(ob->obmat, cpa_1st); pa = psys->particles + cpa->parent; @@ -4470,7 +4470,7 @@ void psys_get_particle_on_path(ParticleSimulationData *sim, w++; } /* apply offset for correct positioning */ - //add_v3_v3(state->co, cpa_1st); + // add_v3_v3(state->co, cpa_1st); } else { /* offset the child from the parent position */ diff --git a/source/blender/blenkernel/intern/particle_system.c b/source/blender/blenkernel/intern/particle_system.c index fb7cbde62b1..cba15aed55f 100644 --- a/source/blender/blenkernel/intern/particle_system.c +++ b/source/blender/blenkernel/intern/particle_system.c @@ -567,7 +567,7 @@ void psys_thread_context_free(ParticleThreadContext *ctx) if (ctx->seams) { MEM_freeN(ctx->seams); } - //if (ctx->vertpart) MEM_freeN(ctx->vertpart); + // if (ctx->vertpart) MEM_freeN(ctx->vertpart); BLI_kdtree_3d_free(ctx->tree); if (ctx->clumpcurve != NULL) { @@ -619,7 +619,7 @@ void initialize_particle(ParticleSimulationData *sim, ParticleData *pa) pa->hair_index = 0; /* we can't reset to -1 anymore since we've figured out correct index in distribute_particles */ /* usage other than straight after distribute has to handle this index by itself - jahka*/ - //pa->num_dmcache = DMCACHE_NOTFOUND; /* assume we don't have a derived mesh face */ + // pa->num_dmcache = DMCACHE_NOTFOUND; /* assume we don't have a derived mesh face */ } static void initialize_all_particles(ParticleSimulationData *sim) @@ -2208,7 +2208,7 @@ static void sph_integrate(ParticleSimulationData *sim, sphdata->pa = pa; sphdata->mass = pa_mass; sphdata->pass = 0; - //sphdata.element_size and sphdata.flow are set in the callback. + // sphdata.element_size and sphdata.flow are set in the callback. /* restore previous state and treat gravity & effectors as external acceleration*/ sub_v3_v3v3(effector_acceleration, pa->state.vel, pa->prev_state.vel); @@ -2300,7 +2300,7 @@ static void basic_integrate(ParticleSimulationData *sim, int p, float dfra, floa mul_v3_fl(pa->state.vel, 1.f - part->dampfac * efdata.ptex.damp * 25.f * dtime); } - //copy_v3_v3(pa->state.ave, states->ave); + // copy_v3_v3(pa->state.ave, states->ave); /* finally we do guides */ time = (cfra - pa->time) / pa->lifetime; @@ -4201,7 +4201,7 @@ static void particles_fluid_step(ParticleSimulationData *sim, float wrf; gzread(gzf, &wrf, sizeof(wrf)); pa->state.co[j] = wrf; - //fprintf(stderr,"Rj%d ",j); + // fprintf(stderr,"Rj%d ",j); } for (j = 0; j < 3; j++) { float wrf; diff --git a/source/blender/blenkernel/intern/pbvh.c b/source/blender/blenkernel/intern/pbvh.c index 1ba3ccbc1a3..c186394880b 100644 --- a/source/blender/blenkernel/intern/pbvh.c +++ b/source/blender/blenkernel/intern/pbvh.c @@ -154,12 +154,12 @@ static void update_node_vb(PBVH *bvh, PBVHNode *node) node->vb = vb; } -//void BKE_pbvh_node_BB_reset(PBVHNode *node) +// void BKE_pbvh_node_BB_reset(PBVHNode *node) //{ // BB_reset(&node->vb); //} // -//void BKE_pbvh_node_BB_expand(PBVHNode *node, float co[3]) +// void BKE_pbvh_node_BB_expand(PBVHNode *node, float co[3]) //{ // BB_expand(&node->vb, co); //} diff --git a/source/blender/blenkernel/intern/pointcache.c b/source/blender/blenkernel/intern/pointcache.c index b56a024fb77..a55d0be4f95 100644 --- a/source/blender/blenkernel/intern/pointcache.c +++ b/source/blender/blenkernel/intern/pointcache.c @@ -631,7 +631,7 @@ static int ptcache_smoke_write(PTCacheFile *pf, void *smoke_v) unsigned int in_len = sizeof(float) * (unsigned int)res; unsigned char *out = (unsigned char *)MEM_callocN(LZO_OUT_LEN(in_len) * 4, "pointcache_lzo_buffer"); - //int mode = res >= 1000000 ? 2 : 1; + // int mode = res >= 1000000 ? 2 : 1; int mode = 1; // light if (sds->cache_comp == SM_CACHE_HEAVY) { mode = 2; // heavy @@ -704,7 +704,7 @@ static int ptcache_smoke_write(PTCacheFile *pf, void *smoke_v) smoke_turbulence_get_res(sds->wt, res_big_array); res_big = res_big_array[0] * res_big_array[1] * res_big_array[2]; - //mode = res_big >= 1000000 ? 2 : 1; + // mode = res_big >= 1000000 ? 2 : 1; mode = 1; // light if (sds->cache_high_comp == SM_CACHE_HEAVY) { mode = 2; // heavy @@ -2286,7 +2286,7 @@ static int ptcache_file_compressed_write( r = LzmaCompress(out, &out_len, in, - in_len, //assume sizeof(char)==1.... + in_len, // assume sizeof(char)==1.... props, &sizeOfIt, 5, diff --git a/source/blender/blenkernel/intern/seqcache.c b/source/blender/blenkernel/intern/seqcache.c index c50f3f3f141..1c0aa63f590 100644 --- a/source/blender/blenkernel/intern/seqcache.c +++ b/source/blender/blenkernel/intern/seqcache.c @@ -617,8 +617,8 @@ void BKE_sequencer_cache_put( } /* Set last_key's reference to this key so we can look up chain backwards - * Item is already put in cache, so cache->last_key points to current key; - */ + * Item is already put in cache, so cache->last_key points to current key; + */ if (flag & type && temp_last_key) { temp_last_key->link_next = cache->last_key; } diff --git a/source/blender/blenkernel/intern/sequencer.c b/source/blender/blenkernel/intern/sequencer.c index 47f9c841e12..85b915874ca 100644 --- a/source/blender/blenkernel/intern/sequencer.c +++ b/source/blender/blenkernel/intern/sequencer.c @@ -2347,7 +2347,7 @@ static void color_balance_byte_byte(StripColorBalance *cb_, int height, float mul) { - //unsigned char cb_tab[3][256]; + // unsigned char cb_tab[3][256]; unsigned char *cp = rect; unsigned char *e = cp + width * 4 * height; unsigned char *m = mask_rect; @@ -4134,8 +4134,8 @@ static pthread_mutex_t queue_lock = PTHREAD_MUTEX_INITIALIZER; static pthread_mutex_t wakeup_lock = PTHREAD_MUTEX_INITIALIZER; static pthread_cond_t wakeup_cond = PTHREAD_COND_INITIALIZER; -//static pthread_mutex_t prefetch_ready_lock = PTHREAD_MUTEX_INITIALIZER; -//static pthread_cond_t prefetch_ready_cond = PTHREAD_COND_INITIALIZER; +// static pthread_mutex_t prefetch_ready_lock = PTHREAD_MUTEX_INITIALIZER; +// static pthread_cond_t prefetch_ready_cond = PTHREAD_COND_INITIALIZER; static pthread_mutex_t frame_done_lock = PTHREAD_MUTEX_INITIALIZER; static pthread_cond_t frame_done_cond = PTHREAD_COND_INITIALIZER; diff --git a/source/blender/blenkernel/intern/shrinkwrap.c b/source/blender/blenkernel/intern/shrinkwrap.c index 8f31d581eef..6a72b46a8f2 100644 --- a/source/blender/blenkernel/intern/shrinkwrap.c +++ b/source/blender/blenkernel/intern/shrinkwrap.c @@ -69,25 +69,25 @@ #define OUT_OF_MEMORY() ((void)printf("Shrinkwrap: Out of memory\n")) typedef struct ShrinkwrapCalcData { - ShrinkwrapModifierData *smd; //shrinkwrap modifier data + ShrinkwrapModifierData *smd; // shrinkwrap modifier data - struct Object *ob; //object we are applying shrinkwrap to + struct Object *ob; // object we are applying shrinkwrap to - struct MVert *vert; //Array of verts being projected (to fetch normals or other data) - float (*vertexCos)[3]; //vertexs being shrinkwraped + struct MVert *vert; // Array of verts being projected (to fetch normals or other data) + float (*vertexCos)[3]; // vertexs being shrinkwraped int numVerts; - struct MDeformVert *dvert; //Pointer to mdeform array - int vgroup; //Vertex group num + struct MDeformVert *dvert; // Pointer to mdeform array + int vgroup; // Vertex group num bool invert_vgroup; /* invert vertex group influence */ - struct Mesh *target; //mesh we are shrinking to - struct SpaceTransform local2target; //transform to move between local and target space + struct Mesh *target; // mesh we are shrinking to + struct SpaceTransform local2target; // transform to move between local and target space struct ShrinkwrapTreeData *tree; // mesh BVH tree data struct Object *aux_target; - float keepDist; //Distance to keep above target surface (units are in local space) + float keepDist; // Distance to keep above target surface (units are in local space) } ShrinkwrapCalcData; typedef struct ShrinkwrapCalcCBData { diff --git a/source/blender/blenkernel/intern/smoke.c b/source/blender/blenkernel/intern/smoke.c index 4e728936e2b..d6858e2d4d2 100644 --- a/source/blender/blenkernel/intern/smoke.c +++ b/source/blender/blenkernel/intern/smoke.c @@ -2676,7 +2676,7 @@ static void update_flowsfluids( float *velocity_x = smoke_get_velocity_x(sds->fluid); float *velocity_y = smoke_get_velocity_y(sds->fluid); float *velocity_z = smoke_get_velocity_z(sds->fluid); - //unsigned char *obstacle = smoke_get_obstacle(sds->fluid); + // unsigned char *obstacle = smoke_get_obstacle(sds->fluid); // DG TODO UNUSED unsigned char *obstacleAnim = smoke_get_obstacle_anim(sds->fluid); int bigres[3]; float *velocity_map = em->velocity; diff --git a/source/blender/blenkernel/intern/softbody.c b/source/blender/blenkernel/intern/softbody.c index a327c3b6074..2a3145bee6c 100644 --- a/source/blender/blenkernel/intern/softbody.c +++ b/source/blender/blenkernel/intern/softbody.c @@ -599,7 +599,7 @@ static void add_mesh_quad_diag_springs(Object *ob) if (ob->soft) { int nofquads; - //float s_shear = ob->soft->shearstiff*ob->soft->shearstiff; + // float s_shear = ob->soft->shearstiff*ob->soft->shearstiff; nofquads = count_mesh_quads(me); if (nofquads) { @@ -1459,7 +1459,7 @@ static void _scan_for_ext_spring_forces( sb->bpoint[bs->v1].pos, sb->bpoint[bs->v2].pos, &damp, feedback, ob, timenow)) { add_v3_v3(bs->ext_force, feedback); bs->flag |= BSF_INTERSECT; - //bs->cf=damp; + // bs->cf=damp; bs->cf = sb->choke * 0.01f; } } @@ -2466,7 +2466,7 @@ static void softbody_apply_forces(Object *ob, float forcetime, int mode, float * else { *err = maxerrpos; } - //printf("EP %f EV %f\n", maxerrpos, maxerrvel); + // printf("EP %f EV %f\n", maxerrpos, maxerrvel); if (fuzzy) { *err /= sb->fuzzyness; } @@ -3183,7 +3183,7 @@ void sbFreeSimulation(SoftBody *sb) /* makes totally fresh start situation */ void sbObjectToSoftbody(Object *ob) { - //ob->softflag |= OB_SB_REDO; + // ob->softflag |= OB_SB_REDO; free_softbody_intern(ob->soft); } @@ -3272,7 +3272,7 @@ void SB_estimate_transform(Object *ob, float lloc[3], float lrot[3][3], float ls } vcloud_estimate_transform_v3(sb->totpoint, opos, NULL, rpos, NULL, com, rcom, lrot, lscale); - //sub_v3_v3(com, rcom); + // sub_v3_v3(com, rcom); if (lloc) { copy_v3_v3(lloc, com); } @@ -3421,7 +3421,7 @@ static void softbody_step( if (forcetime > forcetimemin) { forcetime = max_ff(forcetime / 2.0f, forcetimemin); softbody_restore_prev_step(ob); - //printf("down, "); + // printf("down, "); } else { timedone += forcetime; @@ -3432,7 +3432,7 @@ static void softbody_step( if (sb->scratch->flag & SBF_DOFUZZY) { ///* stay with this stepsize unless err really small */ - //if (err > SoftHeunTol/(2.0f*sb->fuzzyness)) { + // if (err > SoftHeunTol/(2.0f*sb->fuzzyness)) { newtime = forcetime; //} } @@ -3443,7 +3443,7 @@ static void softbody_step( } timedone += forcetime; newtime = min_ff(forcetimemax, max_ff(newtime, forcetimemin)); - //if (newtime > forcetime) printf("up, "); + // if (newtime > forcetime) printf("up, "); if (forcetime > 0.0f) { forcetime = min_ff(dtime - timedone, newtime); } @@ -3476,14 +3476,14 @@ static void softbody_step( } else if (sb->solver_ID == 2) { /* do semi "fake" implicit euler */ - //removed + // removed } /*SOLVER SELECT*/ else if (sb->solver_ID == 4) { /* do semi "fake" implicit euler */ } /*SOLVER SELECT*/ else if (sb->solver_ID == 3) { /* do "stupid" semi "fake" implicit euler */ - //removed + // removed } /*SOLVER SELECT*/ else { diff --git a/source/blender/blenkernel/intern/studiolight.c b/source/blender/blenkernel/intern/studiolight.c index 9888c5d165e..e0ff5fcccca 100644 --- a/source/blender/blenkernel/intern/studiolight.c +++ b/source/blender/blenkernel/intern/studiolight.c @@ -692,7 +692,8 @@ static float studiolight_spherical_harmonics_geomerics_eval( const float normal[3], float sh0, float sh1, float sh2, float sh3) { /* Use Geomerics non-linear SH. */ - /* http://www.geomerics.com/wp-content/uploads/2015/08/CEDEC_Geomerics_ReconstructingDiffuseLighting1.pdf */ + /* http://www.geomerics.com/wp-content/uploads/2015/08/CEDEC_Geomerics_ReconstructingDiffuseLighting1.pdf + */ float R0 = sh0 * M_1_PI; float R1[3] = {-sh3, sh2, -sh1}; diff --git a/source/blender/blenkernel/intern/subsurf_ccg.c b/source/blender/blenkernel/intern/subsurf_ccg.c index ceb501c5a99..ad81fc49b19 100644 --- a/source/blender/blenkernel/intern/subsurf_ccg.c +++ b/source/blender/blenkernel/intern/subsurf_ccg.c @@ -746,7 +746,7 @@ static void ss_sync_ccg_from_derivedmesh(CCGSubSurf *ss, static int hasGivenError = 0; if (!hasGivenError) { - //XXX error("Unrecoverable error in SubSurf calculation," + // XXX error("Unrecoverable error in SubSurf calculation," // " mesh is inconsistent."); hasGivenError = 1; diff --git a/source/blender/blenkernel/intern/suggestions.c b/source/blender/blenkernel/intern/suggestions.c index 42e1ef6fa0a..47d536f4f4f 100644 --- a/source/blender/blenkernel/intern/suggestions.c +++ b/source/blender/blenkernel/intern/suggestions.c @@ -39,7 +39,7 @@ static Text *activeToolText = NULL; static SuggList suggestions = {NULL, NULL, NULL, NULL, NULL}; static char *documentation = NULL; -//static int doc_lines = 0; +// static int doc_lines = 0; static void txttl_free_suggest(void) { diff --git a/source/blender/blenkernel/intern/text.c b/source/blender/blenkernel/intern/text.c index fef8c81980b..f07751e349f 100644 --- a/source/blender/blenkernel/intern/text.c +++ b/source/blender/blenkernel/intern/text.c @@ -2448,7 +2448,7 @@ void txt_do_undo(Text *text, TextUndoBuf *utxt) break; } default: - //XXX error("Undo buffer error - resetting"); + // XXX error("Undo buffer error - resetting"); utxt->pos = -1; break; @@ -2640,7 +2640,7 @@ void txt_do_redo(Text *text, TextUndoBuf *utxt) break; } default: - //XXX error("Undo buffer error - resetting"); + // XXX error("Undo buffer error - resetting"); utxt->pos = -1; break; @@ -3268,7 +3268,7 @@ int txt_setcurr_tab_spaces(Text *text, int space) } while (text->curl->line[i] == indent) { - //we only count those tabs/spaces that are before any text or before the curs; + // we only count those tabs/spaces that are before any text or before the curs; if (i == text->curc) { return i; } diff --git a/source/blender/blenkernel/intern/unit.c b/source/blender/blenkernel/intern/unit.c index aa08370e139..293eed8cfe3 100644 --- a/source/blender/blenkernel/intern/unit.c +++ b/source/blender/blenkernel/intern/unit.c @@ -426,8 +426,8 @@ static size_t unit_as_string(char *str, value_conv = value / unit->scalar; /* Adjust precision to expected number of significant digits. - * Note that here, we shall not have to worry about very big/small numbers, units are expected to replace - * 'scientific notation' in those cases. */ + * Note that here, we shall not have to worry about very big/small numbers, units are expected to + * replace 'scientific notation' in those cases. */ prec -= integer_digits_d(value_conv); CLAMP(prec, 0, 6); @@ -803,7 +803,8 @@ static const bUnitDef *unit_detect_from_str(const bUnitCollection *usys, { /* Try to find a default unit from current or previous string. * This allows us to handle cases like 2 + 2mm, people would expect to get 4mm, not 2.002m! - * Note this does not handle corner cases like 2 + 2cm + 1 + 2.5mm... We can't support everything. */ + * Note this does not handle corner cases like 2 + 2cm + 1 + 2.5mm... We can't support + * everything. */ const bUnitDef *unit = NULL; /* see which units the new value has */ @@ -889,10 +890,12 @@ bool bUnit_ReplaceString( /* Try to find a default unit from current or previous string. */ default_unit = unit_detect_from_str(usys, str, str_prev); - /* We apply the default unit to the whole expression (default unit is now the reference '1.0' one). */ + /* We apply the default unit to the whole expression (default unit is now the reference '1.0' + * one). */ scale_pref_base *= default_unit->scalar; - /* Apply the default unit on the whole expression, this allows to handle nasty cases like '2+2in'. */ + /* Apply the default unit on the whole expression, this allows to handle nasty cases like + * '2+2in'. */ if (BLI_snprintf(str_tmp, sizeof(str_tmp), "(%s)*%.9g", str, default_unit->scalar) < sizeof(str_tmp)) { strncpy(str, str_tmp, len_max); @@ -913,9 +916,9 @@ bool bUnit_ReplaceString( { /* try other unit systems now, so we can evaluate imperial when metric is set for eg. */ - /* Note that checking other systems at that point means we do not support their units as 'default' one. - * In other words, when in metrics, typing '2+2in' will give 2 meters 2 inches, not 4 inches. - * I do think this is the desired behavior! + /* Note that checking other systems at that point means we do not support their units as + * 'default' one. In other words, when in metrics, typing '2+2in' will give 2 meters 2 inches, + * not 4 inches. I do think this is the desired behavior! */ const bUnitCollection *usys_iter; int system_iter; diff --git a/source/blender/blenkernel/intern/writeffmpeg.c b/source/blender/blenkernel/intern/writeffmpeg.c index 0f9dcc2efe2..a74d5b241ed 100644 --- a/source/blender/blenkernel/intern/writeffmpeg.c +++ b/source/blender/blenkernel/intern/writeffmpeg.c @@ -637,7 +637,7 @@ static AVStream *alloc_video_stream(FFMpegContext *context, } /* Deprecated and not doing anything since July 2015, deleted in recent ffmpeg */ - //c->me_method = ME_EPZS; + // c->me_method = ME_EPZS; codec = avcodec_find_encoder(c->codec_id); if (!codec) { @@ -787,7 +787,7 @@ static AVStream *alloc_audio_stream(FFMpegContext *context, codec = avcodec_find_encoder(c->codec_id); if (!codec) { - //XXX error("Couldn't find a valid audio codec"); + // XXX error("Couldn't find a valid audio codec"); return NULL; } @@ -831,7 +831,7 @@ static AVStream *alloc_audio_stream(FFMpegContext *context, set_ffmpeg_properties(rd, c, "audio", &opts); if (avcodec_open2(c, codec, &opts) < 0) { - //XXX error("Couldn't initialize audio codec"); + // XXX error("Couldn't initialize audio codec"); BLI_strncpy(error, IMB_ffmpeg_last_error(), error_size); av_dict_free(&opts); return NULL; @@ -1523,7 +1523,6 @@ static IDProperty *BKE_ffmpeg_property_add(RenderData *rd, (char *)" "; val.string.len = 80; - /* val.str = (char *)" ";*/ idp_type = IDP_STRING; break; case AV_OPT_TYPE_CONST: -- cgit v1.2.3