From 75fc1c35070e0cf247f2d2e4cffe8a6e711522ff Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Fri, 1 Jun 2018 18:19:39 +0200 Subject: Cleanup: trailing whitespace (comment blocks) Strip unindented comment blocks - mainly headers to avoid conflicts. --- source/blender/blenkernel/BKE_DerivedMesh.h | 10 ++++----- source/blender/blenkernel/BKE_animsys.h | 4 ++-- source/blender/blenkernel/BKE_colortools.h | 2 +- source/blender/blenkernel/BKE_depsgraph.h | 2 +- source/blender/blenkernel/BKE_multires.h | 2 +- source/blender/blenkernel/BKE_node.h | 2 +- source/blender/blenkernel/BKE_paint.h | 2 +- source/blender/blenkernel/intern/action.c | 6 ++--- source/blender/blenkernel/intern/anim.c | 2 +- source/blender/blenkernel/intern/anim_sys.c | 26 +++++++++++----------- source/blender/blenkernel/intern/appdir.c | 4 ++-- source/blender/blenkernel/intern/colortools.c | 2 +- source/blender/blenkernel/intern/constraint.c | 12 +++++----- .../blenkernel/intern/data_transfer_intern.h | 4 ++-- source/blender/blenkernel/intern/fcurve.c | 4 ++-- source/blender/blenkernel/intern/fmodifier.c | 10 ++++----- source/blender/blenkernel/intern/ipo.c | 10 ++++----- source/blender/blenkernel/intern/mball.c | 2 +- source/blender/blenkernel/intern/modifier.c | 4 ++-- source/blender/blenkernel/intern/nla.c | 14 ++++++------ source/blender/blenkernel/intern/node.c | 6 ++--- source/blender/blenkernel/intern/object.c | 2 +- source/blender/blenkernel/intern/particle_system.c | 2 +- source/blender/blenkernel/intern/pointcache.c | 2 +- source/blender/blenkernel/intern/scene.c | 2 +- source/blender/blenkernel/intern/seqeffects.c | 2 +- source/blender/blenkernel/intern/sequencer.c | 2 +- source/blender/blenkernel/intern/writeffmpeg.c | 14 ++++++------ 28 files changed, 78 insertions(+), 78 deletions(-) (limited to 'source/blender/blenkernel') diff --git a/source/blender/blenkernel/BKE_DerivedMesh.h b/source/blender/blenkernel/BKE_DerivedMesh.h index 4d2e9ef8b3c..7b3df577111 100644 --- a/source/blender/blenkernel/BKE_DerivedMesh.h +++ b/source/blender/blenkernel/BKE_DerivedMesh.h @@ -38,18 +38,18 @@ * There are three main mesh data structures in Blender: * #Mesh, #CDDerivedMesh and #BMesh. * - * These, and a few others, all implement DerivedMesh interfaces, - * which contains unified drawing interfaces, a few utility interfaces, - * and a bunch of read-only interfaces intended mostly for conversion from + * These, and a few others, all implement DerivedMesh interfaces, + * which contains unified drawing interfaces, a few utility interfaces, + * and a bunch of read-only interfaces intended mostly for conversion from * one format to another. * * All Mesh structures in blender make use of CustomData, which is used to store * per-element attributes and interpolate them (e.g. uvs, vcols, vgroups, etc). - * + * * Mesh is the "serialized" structure, used for storing object-mode mesh data * and also for saving stuff to disk. It's interfaces are also what DerivedMesh * uses to communicate with. - * + * * CDDM is a little mesh library, that uses Mesh data structures in the backend. * It's mostly used for modifiers, and has the advantages of not taking much * resources. diff --git a/source/blender/blenkernel/BKE_animsys.h b/source/blender/blenkernel/BKE_animsys.h index a70690d4029..d25d9c7c2d6 100644 --- a/source/blender/blenkernel/BKE_animsys.h +++ b/source/blender/blenkernel/BKE_animsys.h @@ -184,9 +184,9 @@ bool BKE_animsys_execute_fcurve(struct PointerRNA *ptr, struct AnimMapper *remap /* ------------ Specialized API --------------- */ /* There are a few special tools which require these following functions. They are NOT to be used - * for standard animation evaluation UNDER ANY CIRCUMSTANCES! + * for standard animation evaluation UNDER ANY CIRCUMSTANCES! * - * i.e. Pose Library (PoseLib) uses some of these for selectively applying poses, but + * i.e. Pose Library (PoseLib) uses some of these for selectively applying poses, but * Particles/Sequencer performing funky time manipulation is not ok. */ diff --git a/source/blender/blenkernel/BKE_colortools.h b/source/blender/blenkernel/BKE_colortools.h index f68c4a2757b..5332b3acd72 100644 --- a/source/blender/blenkernel/BKE_colortools.h +++ b/source/blender/blenkernel/BKE_colortools.h @@ -4,7 +4,7 @@ * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. + * of the License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/source/blender/blenkernel/BKE_depsgraph.h b/source/blender/blenkernel/BKE_depsgraph.h index 40564aeabe9..0b81cfd4477 100644 --- a/source/blender/blenkernel/BKE_depsgraph.h +++ b/source/blender/blenkernel/BKE_depsgraph.h @@ -105,7 +105,7 @@ void DAG_scene_free(struct Scene *sce); * * DAG_scene_update_flags will mark all objects that depend on time (animation, * physics, ..) to be recalculated, used when changing the current frame. - * + * * DAG_on_visible_update will mark all objects that are visible for the first * time to be updated, for example on file load or changing layer visibility. * diff --git a/source/blender/blenkernel/BKE_multires.h b/source/blender/blenkernel/BKE_multires.h index 178751d1640..d8199c96d6b 100644 --- a/source/blender/blenkernel/BKE_multires.h +++ b/source/blender/blenkernel/BKE_multires.h @@ -23,7 +23,7 @@ * Contributor(s): none yet. * * ***** END GPL LICENSE BLOCK ***** - */ + */ #ifndef __BKE_MULTIRES_H__ #define __BKE_MULTIRES_H__ diff --git a/source/blender/blenkernel/BKE_node.h b/source/blender/blenkernel/BKE_node.h index 150f0818cb8..7a3bf81a2af 100644 --- a/source/blender/blenkernel/BKE_node.h +++ b/source/blender/blenkernel/BKE_node.h @@ -86,7 +86,7 @@ struct bNodeInstanceHash; /** Compact definition of a node socket. * Can be used to quickly define a list of static sockets for a node, - * which are added to each new node of that type. + * which are added to each new node of that type. * * \deprecated This struct is used by C nodes to define templates as simple * static struct lists. These are converted to the new template collections diff --git a/source/blender/blenkernel/BKE_paint.h b/source/blender/blenkernel/BKE_paint.h index 285b9b3f99f..9dbd17bfaab 100644 --- a/source/blender/blenkernel/BKE_paint.h +++ b/source/blender/blenkernel/BKE_paint.h @@ -23,7 +23,7 @@ * Contributor(s): none yet. * * ***** END GPL LICENSE BLOCK ***** - */ + */ #ifndef __BKE_PAINT_H__ #define __BKE_PAINT_H__ diff --git a/source/blender/blenkernel/intern/action.c b/source/blender/blenkernel/intern/action.c index 9823a501092..fa36da8030e 100644 --- a/source/blender/blenkernel/intern/action.c +++ b/source/blender/blenkernel/intern/action.c @@ -264,7 +264,7 @@ bActionGroup *action_groups_add_new(bAction *act, const char name[]) /* Add given channel into (active) group * - assumes that channel is not linked to anything anymore - * - always adds at the end of the group + * - always adds at the end of the group */ void action_groups_add_channel(bAction *act, bActionGroup *agrp, FCurve *fcurve) { @@ -939,7 +939,7 @@ void BKE_pose_channel_copy_data(bPoseChannel *pchan, const bPoseChannel *pchan_f /* checks for IK constraint, Spline IK, and also for Follow-Path constraint. - * can do more constraints flags later + * can do more constraints flags later */ /* pose should be entirely OK */ void BKE_pose_update_constraint_flags(bPose *pose) @@ -1432,7 +1432,7 @@ void BKE_pose_tag_recalc(Main *bmain, bPose *pose) } /* For the calculation of the effects of an Action at the given frame on an object - * This is currently only used for the Action Constraint + * This is currently only used for the Action Constraint */ void what_does_obaction(Object *ob, Object *workob, bPose *pose, bAction *act, char groupname[], float cframe) { diff --git a/source/blender/blenkernel/intern/anim.c b/source/blender/blenkernel/intern/anim.c index 2f65e71c6d2..a0f069bccf2 100644 --- a/source/blender/blenkernel/intern/anim.c +++ b/source/blender/blenkernel/intern/anim.c @@ -276,7 +276,7 @@ void animviz_get_object_motionpaths(Object *ob, ListBase *targets) /* Note on evaluation optimizations: * Optimization's currently used here play tricks with the depsgraph in order to try and * evaluate as few objects as strictly necessary to get nicer performance under standard - * production conditions. For those people who really need the accurate version, + * production conditions. For those people who really need the accurate version, * disable the ifdef (i.e. 1 -> 0) and comment out the call to motionpaths_calc_optimise_depsgraph() */ diff --git a/source/blender/blenkernel/intern/anim_sys.c b/source/blender/blenkernel/intern/anim_sys.c index e2c371348e5..924b1951d37 100644 --- a/source/blender/blenkernel/intern/anim_sys.c +++ b/source/blender/blenkernel/intern/anim_sys.c @@ -140,7 +140,7 @@ AnimData *BKE_animdata_from_id(ID *id) /* Add AnimData to the given ID-block. In order for this to work, we assume that * the AnimData pointer is stored immediately after the given ID-block in the struct, - * as per IdAdtTemplate. Also note that + * as per IdAdtTemplate. Also note that */ AnimData *BKE_animdata_add_id(ID *id) { @@ -418,8 +418,8 @@ static bool animpath_matches_basepath(const char path[], const char basepath[]) } /* Move F-Curves in src action to dst action, setting up all the necessary groups - * for this to happen, but only if the F-Curves being moved have the appropriate - * "base path". + * for this to happen, but only if the F-Curves being moved have the appropriate + * "base path". * - This is used when data moves from one datablock to another, causing the * F-Curves to need to be moved over too */ @@ -2633,7 +2633,7 @@ static void animsys_evaluate_nla(ListBase *echannels, PointerRNA *ptr, AnimData } /* NLA Evaluation function (mostly for use through do_animdata) - * - All channels that will be affected are not cleared anymore. Instead, we just evaluate into + * - All channels that will be affected are not cleared anymore. Instead, we just evaluate into * some temp channels, where values can be accumulated in one go. */ static void animsys_calculate_nla(PointerRNA *ptr, AnimData *adt, float ctime) @@ -2687,7 +2687,7 @@ static void animsys_evaluate_overrides(PointerRNA *ptr, AnimData *adt) /* Evaluation System - Public API */ /* Overview of how this system works: - * 1) Depsgraph sorts data as necessary, so that data is in an order that means + * 1) Depsgraph sorts data as necessary, so that data is in an order that means * that all dependencies are resolved before dependents. * 2) All normal animation is evaluated, so that drivers have some basis values to * work with @@ -2695,33 +2695,33 @@ static void animsys_evaluate_overrides(PointerRNA *ptr, AnimData *adt) * which modify the effects of the NLA-stacks * b. Active Action is evaluated as per normal, on top of the results of the NLA tracks * - * --------------< often in a separate phase... >------------------ + * --------------< often in a separate phase... >------------------ * * 3) Drivers/expressions are evaluated on top of this, in an order where dependencies are - * resolved nicely. + * resolved nicely. * Note: it may be necessary to have some tools to handle the cases where some higher-level * drivers are added and cause some problematic dependencies that didn't exist in the local levels... * - * --------------< always executed >------------------ + * --------------< always executed >------------------ * * Maintenance of editability of settings (XXX): * In order to ensure that settings that are animated can still be manipulated in the UI without requiring - * that keyframes are added to prevent these values from being overwritten, we use 'overrides'. + * that keyframes are added to prevent these values from being overwritten, we use 'overrides'. * * Unresolved things: * - Handling of multi-user settings (i.e. time-offset, group-instancing) -> big cache grids or nodal system? but stored where? - * - Multiple-block dependencies (i.e. drivers for settings are in both local and higher levels) -> split into separate lists? + * - Multiple-block dependencies (i.e. drivers for settings are in both local and higher levels) -> split into separate lists? * * Current Status: - * - Currently (as of September 2009), overrides we haven't needed to (fully) implement overrides. + * - Currently (as of September 2009), overrides we haven't needed to (fully) implement overrides. * However, the code for this is relatively harmless, so is left in the code for now. */ /* Evaluation loop for evaluation animation data * * This assumes that the animation-data provided belongs to the ID block in question, - * and that the flags for which parts of the anim-data settings need to be recalculated - * have been set already by the depsgraph. Now, we use the recalc + * and that the flags for which parts of the anim-data settings need to be recalculated + * have been set already by the depsgraph. Now, we use the recalc */ void BKE_animsys_evaluate_animdata(Scene *scene, ID *id, AnimData *adt, float ctime, short recalc) { diff --git a/source/blender/blenkernel/intern/appdir.c b/source/blender/blenkernel/intern/appdir.c index 16f8d16860f..01a5cc260ad 100644 --- a/source/blender/blenkernel/intern/appdir.c +++ b/source/blender/blenkernel/intern/appdir.c @@ -718,13 +718,13 @@ bool BKE_appdir_app_template_id_search(const char *app_template, char *path, siz /** * Gets the temp directory when blender first runs. * If the default path is not found, use try $TEMP - * + * * Also make sure the temp dir has a trailing slash * * \param fullname The full path to the temporary temp directory * \param basename The full path to the persistent temp directory (may be NULL) * \param maxlen The size of the fullname buffer - * \param userdir Directory specified in user preferences + * \param userdir Directory specified in user preferences */ static void where_is_temp(char *fullname, char *basename, const size_t maxlen, char *userdir) { diff --git a/source/blender/blenkernel/intern/colortools.c b/source/blender/blenkernel/intern/colortools.c index 337d1a1a149..6c97380b9ca 100644 --- a/source/blender/blenkernel/intern/colortools.c +++ b/source/blender/blenkernel/intern/colortools.c @@ -4,7 +4,7 @@ * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. + * of the License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/source/blender/blenkernel/intern/constraint.c b/source/blender/blenkernel/intern/constraint.c index 13358311f92..25a77821dd2 100644 --- a/source/blender/blenkernel/intern/constraint.c +++ b/source/blender/blenkernel/intern/constraint.c @@ -105,7 +105,7 @@ /* ************************ Constraints - General Utilities *************************** */ /* These functions here don't act on any specific constraints, and are therefore should/will - * not require any of the special function-pointers afforded by the relevant constraint + * not require any of the special function-pointers afforded by the relevant constraint * type-info structs. */ @@ -655,7 +655,7 @@ static void constraint_target_to_mat4(Object *ob, const char *substring, float m /* ************************* Specific Constraints ***************************** */ /* Each constraint defines a set of functions, which will be called at the appropriate * times. In addition to this, each constraint should have a type-info struct, where - * its functions are attached for use. + * its functions are attached for use. */ /* Template for type-info data: @@ -664,7 +664,7 @@ static void constraint_target_to_mat4(Object *ob, const char *substring, float m * - although the naming of functions doesn't matter, it would help for code * readability, to follow the same naming convention as is presented here * - any functions that a constraint doesn't need to define, don't define - * for such cases, just use NULL + * for such cases, just use NULL * - these should be defined after all the functions have been defined, so that * forward-definitions/prototypes don't need to be used! * - keep this copy #if-def'd so that future constraints can get based off this @@ -4528,7 +4528,7 @@ static void con_unlink_refs_cb(bConstraint *UNUSED(con), ID **idpoin, bool is_re /* Free data of a specific constraint if it has any info. * be sure to run BIK_clear_data() when freeing an IK constraint, - * unless DAG_relations_tag_update is called. + * unless DAG_relations_tag_update is called. */ void BKE_constraint_free_data_ex(bConstraint *con, bool do_id_user) { @@ -4862,7 +4862,7 @@ bool BKE_constraints_proxylocked_owner(Object *ob, bPoseChannel *pchan) /* This function is a relic from the prior implementations of the constraints system, when all * constraints either had one or no targets. It used to be called during the main constraint solving - * loop, but is now only used for the remaining cases for a few constraints. + * loop, but is now only used for the remaining cases for a few constraints. * * None of the actual calculations of the matrices should be done here! Also, this function is * not to be used by any new constraints, particularly any that have multiple targets. @@ -4966,7 +4966,7 @@ void BKE_constraint_targets_for_solving_get(bConstraint *con, bConstraintOb *cob /* This function is called whenever constraints need to be evaluated. Currently, all * constraints that can be evaluated are every time this gets run. * - * BKE_constraints_make_evalob and BKE_constraints_clear_evalob should be called before and + * BKE_constraints_make_evalob and BKE_constraints_clear_evalob should be called before and * after running this function, to sort out cob */ void BKE_constraints_solve(ListBase *conlist, bConstraintOb *cob, float ctime) diff --git a/source/blender/blenkernel/intern/data_transfer_intern.h b/source/blender/blenkernel/intern/data_transfer_intern.h index 352eedc6ec2..1a543a1deb5 100644 --- a/source/blender/blenkernel/intern/data_transfer_intern.h +++ b/source/blender/blenkernel/intern/data_transfer_intern.h @@ -4,7 +4,7 @@ * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. + * of the License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -18,7 +18,7 @@ * The Original Code is Copyright (C) 2014 Blender Foundation. * All rights reserved. * - * + * * Contributor(s): Bastien Montagne * * ***** END GPL LICENSE BLOCK ***** diff --git a/source/blender/blenkernel/intern/fcurve.c b/source/blender/blenkernel/intern/fcurve.c index 905f103250a..0de04e31be9 100644 --- a/source/blender/blenkernel/intern/fcurve.c +++ b/source/blender/blenkernel/intern/fcurve.c @@ -270,7 +270,7 @@ FCurve *iter_step_fcurve(FCurve *fcu_iter, const char rna_path[]) /* Get list of LinkData's containing pointers to the F-Curves which control the types of data indicated * Lists... - * - dst: list of LinkData's matching the criteria returned. + * - dst: list of LinkData's matching the criteria returned. * List must be freed after use, and is assumed to be empty when passed. * - src: list of F-Curves to search through * Filters... @@ -879,7 +879,7 @@ void fcurve_store_samples(FCurve *fcu, void *data, int start, int end, FcuSample /* ***************************** F-Curve Sanity ********************************* */ /* The functions here are used in various parts of Blender, usually after some editing * of keyframe data has occurred. They ensure that keyframe data is properly ordered and - * that the handles are correctly + * that the handles are correctly */ /* Checks if the F-Curve has a Cycles modifier with simple settings that warrant transition smoothing */ diff --git a/source/blender/blenkernel/intern/fmodifier.c b/source/blender/blenkernel/intern/fmodifier.c index f1834bdf8a6..f3d0a5fe085 100644 --- a/source/blender/blenkernel/intern/fmodifier.c +++ b/source/blender/blenkernel/intern/fmodifier.c @@ -58,14 +58,14 @@ void *fmodifiers_storage_get(FModifierStackStorage *storage, FModifier *fcm); /* Info ------------------------------- */ /* F-Modifiers are modifiers which operate on F-Curves. However, they can also be defined - * on NLA-Strips to affect all of the F-Curves referenced by the NLA-Strip. + * on NLA-Strips to affect all of the F-Curves referenced by the NLA-Strip. */ /* Template --------------------------- */ /* Each modifier defines a set of functions, which will be called at the appropriate * times. In addition to this, each modifier should have a type-info struct, where - * its functions are attached for use. + * its functions are attached for use. */ /* Template for type-info data: @@ -74,7 +74,7 @@ void *fmodifiers_storage_get(FModifierStackStorage *storage, FModifier *fcm); * - although the naming of functions doesn't matter, it would help for code * readability, to follow the same naming convention as is presented here * - any functions that a constraint doesn't need to define, don't define - * for such cases, just use NULL + * for such cases, just use NULL * - these should be defined after all the functions have been defined, so that * forward-definitions/prototypes don't need to be used! * - keep this copy #if-def'd so that future constraints can get based off this @@ -260,7 +260,7 @@ static FModifierTypeInfo FMI_GENERATOR = { * x is the evaluation 'time', and 'y' is the resultant value * * Functions available are - * sin, cos, tan, sinc (normalized sin), natural log, square root + * sin, cos, tan, sinc (normalized sin), natural log, square root */ static void fcm_fn_generator_new_data(void *mdata) @@ -1397,7 +1397,7 @@ static float eval_fmodifier_influence(FModifier *fcm, float evaltime) } /* evaluate time modifications imposed by some F-Curve Modifiers - * - this step acts as an optimization to prevent the F-Curve stack being evaluated + * - this step acts as an optimization to prevent the F-Curve stack being evaluated * several times by modifiers requesting the time be modified, as the final result * would have required using the modified time * - modifiers only ever receive the unmodified time, as subsequent modifiers should be diff --git a/source/blender/blenkernel/intern/ipo.c b/source/blender/blenkernel/intern/ipo.c index fcbc25ebad5..fe6778e8e56 100644 --- a/source/blender/blenkernel/intern/ipo.c +++ b/source/blender/blenkernel/intern/ipo.c @@ -266,7 +266,7 @@ static const char *ob_adrcodes_to_paths(int adrcode, int *array_index) } /* PoseChannel types - * NOTE: pchan name comes from 'actname' added earlier... + * NOTE: pchan name comes from 'actname' added earlier... */ static const char *pchan_adrcodes_to_paths(int adrcode, int *array_index) { @@ -329,7 +329,7 @@ static const char *constraint_adrcodes_to_paths(int adrcode, int *array_index) } /* ShapeKey types - * NOTE: as we don't have access to the keyblock where the data comes from (for now), + * NOTE: as we don't have access to the keyblock where the data comes from (for now), * we'll just use numerical indices for now... */ static char *shapekey_adrcodes_to_paths(ID *id, int adrcode, int *UNUSED(array_index)) @@ -1687,10 +1687,10 @@ static void nlastrips_to_animdata(ID *id, ListBase *strips) /* Called from do_versions() in readfile.c to convert the old 'IPO/adrcode' system * to the new 'Animato/RNA' system. * - * The basic method used here, is to loop over datablocks which have IPO-data, and - * add those IPO's to new AnimData blocks as Actions. + * The basic method used here, is to loop over datablocks which have IPO-data, and + * add those IPO's to new AnimData blocks as Actions. * Action/NLA data only works well for Objects, so these only need to be checked for there. - * + * * Data that has been converted should be freed immediately, which means that it is immediately * clear which datablocks have yet to be converted, and also prevent freeing errors when we exit. */ diff --git a/source/blender/blenkernel/intern/mball.c b/source/blender/blenkernel/intern/mball.c index 3609fde7711..d15275e66ce 100644 --- a/source/blender/blenkernel/intern/mball.c +++ b/source/blender/blenkernel/intern/mball.c @@ -273,7 +273,7 @@ float *BKE_mball_make_orco(Object *ob, ListBase *dispbase) * This really needs a rewrite/refactor its totally broken in anything other then basic cases * Multiple Scenes + Set Scenes & mixing mball basis SHOULD work but fails to update the depsgraph on rename * and linking into scenes or removal of basis mball. so take care when changing this code. - * + * * Main idiot thing here is that the system returns find_basis_mball() objects which fail a is_basis_mball() test. * * Not only that but the depsgraph and their areas depend on this behavior!, so making small fixes here isn't worth it. diff --git a/source/blender/blenkernel/intern/modifier.c b/source/blender/blenkernel/intern/modifier.c index 50923901a36..0cf10f7590c 100644 --- a/source/blender/blenkernel/intern/modifier.c +++ b/source/blender/blenkernel/intern/modifier.c @@ -389,9 +389,9 @@ void modifier_setError(ModifierData *md, const char *_format, ...) /* used for buttons, to find out if the 'draw deformed in editmode' option is * there - * + * * also used in transform_conversion.c, to detect CrazySpace [tm] (2nd arg - * then is NULL) + * then is NULL) * also used for some mesh tools to give warnings */ int modifiers_getCageIndex(struct Scene *scene, Object *ob, int *r_lastPossibleCageIndex, bool is_virtual) diff --git a/source/blender/blenkernel/intern/nla.c b/source/blender/blenkernel/intern/nla.c index e239037df70..dadef74b4de 100644 --- a/source/blender/blenkernel/intern/nla.c +++ b/source/blender/blenkernel/intern/nla.c @@ -73,7 +73,7 @@ /* Freeing ------------------------------------------- */ /* Remove the given NLA strip from the NLA track it occupies, free the strip's data, - * and the strip itself. + * and the strip itself. */ void BKE_nlastrip_free(ListBase *strips, NlaStrip *strip) { @@ -400,7 +400,7 @@ NlaStrip *BKE_nla_add_soundstrip(Scene *scene, Speaker *speaker) /* Strip Mapping ------------------------------------- */ /* non clipped mapping for strip-time <-> global time (for Action-Clips) - * invert = convert action-strip time to global time + * invert = convert action-strip time to global time */ static float nlastrip_get_frame_actionclip(NlaStrip *strip, float cframe, short mode) { @@ -470,7 +470,7 @@ static float nlastrip_get_frame_actionclip(NlaStrip *strip, float cframe, short } /* non clipped mapping for strip-time <-> global time (for Transitions) - * invert = convert action-strip time to global time + * invert = convert action-strip time to global time */ static float nlastrip_get_frame_transition(NlaStrip *strip, float cframe, short mode) { @@ -597,7 +597,7 @@ bool BKE_nlastrips_has_space(ListBase *strips, float start, float end) } /* Rearrange the strips in the track so that they are always in order - * (usually only needed after a strip has been moved) + * (usually only needed after a strip has been moved) */ void BKE_nlastrips_sort_strips(ListBase *strips) { @@ -1037,7 +1037,7 @@ bool BKE_nlatrack_has_space(NlaTrack *nlt, float start, float end) } /* Rearrange the strips in the track so that they are always in order - * (usually only needed after a strip has been moved) + * (usually only needed after a strip has been moved) */ void BKE_nlatrack_sort_strips(NlaTrack *nlt) { @@ -1050,7 +1050,7 @@ void BKE_nlatrack_sort_strips(NlaTrack *nlt) } /* Add the given NLA-Strip to the given NLA-Track, assuming that it - * isn't currently attached to another one + * isn't currently attached to another one */ bool BKE_nlatrack_add_strip(NlaTrack *nlt, NlaStrip *strip) { @@ -1757,7 +1757,7 @@ bool BKE_nla_action_stash(AnimData *adt) /* Core Tools ------------------------------------------- */ /* For the given AnimData block, add the active action to the NLA - * stack (i.e. 'push-down' action). The UI should only allow this + * stack (i.e. 'push-down' action). The UI should only allow this * for normal editing only (i.e. not in editmode for some strip's action), * so no checks for this are performed. */ diff --git a/source/blender/blenkernel/intern/node.c b/source/blender/blenkernel/intern/node.c index 521874bb14f..062b8572be1 100644 --- a/source/blender/blenkernel/intern/node.c +++ b/source/blender/blenkernel/intern/node.c @@ -4,7 +4,7 @@ * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. + * of the License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -834,7 +834,7 @@ bool nodeIsChildOf(const bNode *parent, const bNode *child) /** * Iterate over a chain of nodes, starting with \a node_start, executing * \a callback for each node (which can return false to end iterator). - * + * * \param reversed for backwards iteration * \note Recursive */ @@ -866,7 +866,7 @@ void nodeChainIter( /** * Iterate over all parents of \a node, executing \a callback for each parent (which can return false to end iterator) - * + * * \note Recursive */ void nodeParentsIter(bNode *node, bool (*callback)(bNode *, void *), void *userdata) diff --git a/source/blender/blenkernel/intern/object.c b/source/blender/blenkernel/intern/object.c index 02578a704b3..ea3ecf29c15 100644 --- a/source/blender/blenkernel/intern/object.c +++ b/source/blender/blenkernel/intern/object.c @@ -3296,7 +3296,7 @@ static void obrel_list_add(LinkNode **links, Object *ob) * Iterates over all objects of the given scene. * Depending on the eObjectSet flag: * collect either OB_SET_ALL, OB_SET_VISIBLE or OB_SET_SELECTED objects. - * If OB_SET_VISIBLE or OB_SET_SELECTED are collected, + * If OB_SET_VISIBLE or OB_SET_SELECTED are collected, * then also add related objects according to the given includeFilters. */ LinkNode *BKE_object_relational_superset(struct Scene *scene, eObjectSet objectSet, eObRelationTypes includeFilter) diff --git a/source/blender/blenkernel/intern/particle_system.c b/source/blender/blenkernel/intern/particle_system.c index d8d59e9d2ac..6261ab0bee3 100644 --- a/source/blender/blenkernel/intern/particle_system.c +++ b/source/blender/blenkernel/intern/particle_system.c @@ -1445,7 +1445,7 @@ static void integrate_particle(ParticleSettings *part, ParticleData *pa, float d } /********************************************************************************************************* - * SPH fluid physics + * SPH fluid physics * * In theory, there could be unlimited implementation of SPH simulators * diff --git a/source/blender/blenkernel/intern/pointcache.c b/source/blender/blenkernel/intern/pointcache.c index 3d1cdba1cdd..b6d9ba71c2c 100644 --- a/source/blender/blenkernel/intern/pointcache.c +++ b/source/blender/blenkernel/intern/pointcache.c @@ -2939,7 +2939,7 @@ int BKE_ptcache_write(PTCacheID *pid, unsigned int cfra) return !error; } /* youll need to close yourself after! - * mode - PTCACHE_CLEAR_ALL, + * mode - PTCACHE_CLEAR_ALL, */ /* Clears & resets */ diff --git a/source/blender/blenkernel/intern/scene.c b/source/blender/blenkernel/intern/scene.c index 08b5fdb07dc..15ba5079ab5 100644 --- a/source/blender/blenkernel/intern/scene.c +++ b/source/blender/blenkernel/intern/scene.c @@ -1274,7 +1274,7 @@ bool BKE_scene_validate_setscene(Main *bmain, Scene *sce) } /* This function is needed to cope with fractional frames - including two Blender rendering features - * mblur (motion blur that renders 'subframes' and blurs them together), and fields rendering. + * mblur (motion blur that renders 'subframes' and blurs them together), and fields rendering. */ float BKE_scene_frame_get(const Scene *scene) { diff --git a/source/blender/blenkernel/intern/seqeffects.c b/source/blender/blenkernel/intern/seqeffects.c index 176d1224979..0eca7a00515 100644 --- a/source/blender/blenkernel/intern/seqeffects.c +++ b/source/blender/blenkernel/intern/seqeffects.c @@ -18,7 +18,7 @@ * The Original Code is Copyright (C) 2001-2002 by NaN Holding BV. * All rights reserved. * - * Contributor(s): + * Contributor(s): * - Blender Foundation, 2003-2009 * - Peter Schlaile 2005/2006 * diff --git a/source/blender/blenkernel/intern/sequencer.c b/source/blender/blenkernel/intern/sequencer.c index 6d3c7ed1959..1b747c4a24f 100644 --- a/source/blender/blenkernel/intern/sequencer.c +++ b/source/blender/blenkernel/intern/sequencer.c @@ -18,7 +18,7 @@ * The Original Code is Copyright (C) 2001-2002 by NaN Holding BV. * All rights reserved. * - * Contributor(s): + * Contributor(s): * - Blender Foundation, 2003-2009 * - Peter Schlaile 2005/2006 * diff --git a/source/blender/blenkernel/intern/writeffmpeg.c b/source/blender/blenkernel/intern/writeffmpeg.c index fc719634ff5..eb7ad38c456 100644 --- a/source/blender/blenkernel/intern/writeffmpeg.c +++ b/source/blender/blenkernel/intern/writeffmpeg.c @@ -1053,19 +1053,19 @@ fail: } /** - * Writes any delayed frames in the encoder. This function is called before + * Writes any delayed frames in the encoder. This function is called before * closing the encoder. * *

- * Since an encoder may use both past and future frames to predict - * inter-frames (H.264 B-frames, for example), it can output the frames + * Since an encoder may use both past and future frames to predict + * inter-frames (H.264 B-frames, for example), it can output the frames * in a different order from the one it was given. * For example, when sending frames 1, 2, 3, 4 to the encoder, it may write * them in the order 1, 4, 2, 3 - first the two frames used for prediction, - * and then the bidirectionally-predicted frames. What this means in practice - * is that the encoder may not immediately produce one output frame for each - * input frame. These delayed frames must be flushed before we close the - * stream. We do this by calling avcodec_encode_video with NULL for the last + * and then the bidirectionally-predicted frames. What this means in practice + * is that the encoder may not immediately produce one output frame for each + * input frame. These delayed frames must be flushed before we close the + * stream. We do this by calling avcodec_encode_video with NULL for the last * parameter. *

*/ -- cgit v1.2.3