diff options
Diffstat (limited to 'source/blender/blenkernel/intern')
| -rw-r--r-- | source/blender/blenkernel/intern/anim_data.c | 6 | ||||
| -rw-r--r-- | source/blender/blenkernel/intern/anim_sys.c | 20 | ||||
| -rw-r--r-- | source/blender/blenkernel/intern/collection.c | 6 | ||||
| -rw-r--r-- | source/blender/blenkernel/intern/fcurve.c | 17 | ||||
| -rw-r--r-- | source/blender/blenkernel/intern/gpencil.c | 3 | ||||
| -rw-r--r-- | source/blender/blenkernel/intern/gpencil_modifier.c | 6 | ||||
| -rw-r--r-- | source/blender/blenkernel/intern/lib_override.c | 14 | ||||
| -rw-r--r-- | source/blender/blenkernel/intern/mesh_boolean_convert.cc | 9 | ||||
| -rw-r--r-- | source/blender/blenkernel/intern/nla.c | 12 | ||||
| -rw-r--r-- | source/blender/blenkernel/intern/node.cc | 6 | ||||
| -rw-r--r-- | source/blender/blenkernel/intern/object.c | 17 | ||||
| -rw-r--r-- | source/blender/blenkernel/intern/text.c | 3 |
12 files changed, 79 insertions, 40 deletions
diff --git a/source/blender/blenkernel/intern/anim_data.c b/source/blender/blenkernel/intern/anim_data.c index 633d6202222..447ed8fbe14 100644 --- a/source/blender/blenkernel/intern/anim_data.c +++ b/source/blender/blenkernel/intern/anim_data.c @@ -287,8 +287,10 @@ bool BKE_animdata_id_is_animated(const struct ID *id) !BLI_listbase_is_empty(&adt->overrides); } -/** Callback used by lib_query to walk over all ID usages (mimics `foreach_id` callback of - * `IDTypeInfo` structure). */ +/** + * Callback used by lib_query to walk over all ID usages (mimics `foreach_id` callback of + * `IDTypeInfo` structure). + */ void BKE_animdata_foreach_id(AnimData *adt, LibraryForeachIDData *data) { LISTBASE_FOREACH (FCurve *, fcu, &adt->drivers) { diff --git a/source/blender/blenkernel/intern/anim_sys.c b/source/blender/blenkernel/intern/anim_sys.c index 9a890fd02be..6f4af6f655d 100644 --- a/source/blender/blenkernel/intern/anim_sys.c +++ b/source/blender/blenkernel/intern/anim_sys.c @@ -1605,8 +1605,9 @@ static bool nla_combine_get_inverted_strip_value(const int mix_mode, } } -/** Accumulate quaternion channels for Combine mode according to influence. - * \returns blended_value = lower_values @ strip_values^infl +/** + * Accumulate quaternion channels for Combine mode according to influence. + * \returns `blended_value = lower_values @ strip_values^infl` */ static void nla_combine_quaternion(const float lower_values[4], const float strip_values[4], @@ -2094,8 +2095,10 @@ static void animsys_evaluate_nla_domain(PointerRNA *ptr, NlaEvalData *channels, /* ---------------------- */ -/** Tweaked strip is evaluated differently from other strips. Adjacent strips are ignored - * and includes a workaround for when user is not editing in place. */ +/** + * Tweaked strip is evaluated differently from other strips. Adjacent strips are ignored + * and includes a workaround for when user is not editing in place. + */ static void animsys_create_tweak_strip(const AnimData *adt, const bool keyframing_to_strip, NlaStrip *r_tweak_strip) @@ -2210,8 +2213,10 @@ static bool is_nlatrack_evaluatable(const AnimData *adt, const NlaTrack *nlt) return true; } -/** Check for special case of non-pushed action being evaluated with no NLA influence (off and no - * strips evaluated) nor NLA interference (ensure NLA not soloing). */ +/** + * Check for special case of non-pushed action being evaluated with no NLA influence (off and no + * strips evaluated) nor NLA interference (ensure NLA not soloing). + */ static bool is_action_track_evaluated_without_nla(const AnimData *adt, const bool any_strip_evaluated) { @@ -2491,7 +2496,8 @@ void nlasnapshot_ensure_channels(NlaEvalData *eval_data, NlaEvalSnapshot *snapsh } } -/** Blends the \a lower_snapshot with the \a upper_snapshot into \a r_blended_snapshot according +/** + * Blends the \a lower_snapshot with the \a upper_snapshot into \a r_blended_snapshot according * to the given \a upper_blendmode and \a upper_influence. * * For \a upper_snapshot, blending limited to values in the \a blend_domain. For Replace blendmode, diff --git a/source/blender/blenkernel/intern/collection.c b/source/blender/blenkernel/intern/collection.c index e7e978aaf9b..89bb7b36406 100644 --- a/source/blender/blenkernel/intern/collection.c +++ b/source/blender/blenkernel/intern/collection.c @@ -2168,11 +2168,13 @@ void BKE_scene_objects_iterator_end(BLI_Iterator *iter) } } -/** Generate a new GSet (or extend given `objects_gset` if not NULL) with all objects referenced by +/** + * Generate a new GSet (or extend given `objects_gset` if not NULL) with all objects referenced by * all collections of given `scene`. * * \note: This will include objects without a base currently (because they would belong to excluded - * collections only e.g.). */ + * collections only e.g.). + */ GSet *BKE_scene_objects_as_gset(Scene *scene, GSet *objects_gset) { BLI_Iterator iter; diff --git a/source/blender/blenkernel/intern/fcurve.c b/source/blender/blenkernel/intern/fcurve.c index 010ab09bb31..30d5a54b479 100644 --- a/source/blender/blenkernel/intern/fcurve.c +++ b/source/blender/blenkernel/intern/fcurve.c @@ -181,8 +181,10 @@ void BKE_fcurves_copy(ListBase *dst, ListBase *src) } } -/** Callback used by lib_query to walk over all ID usages (mimics `foreach_id` callback of - * `IDTypeInfo` structure). */ +/** + * Callback used by lib_query to walk over all ID usages (mimics `foreach_id` callback of + * `IDTypeInfo` structure). + */ void BKE_fcurve_foreach_id(FCurve *fcu, LibraryForeachIDData *data) { ChannelDriver *driver = fcu->driver; @@ -1508,7 +1510,8 @@ bool test_time_fcurve(FCurve *fcu) /** \name F-Curve Calculations * \{ */ -/* The length of each handle is not allowed to be more +/** + * The length of each handle is not allowed to be more * than the horizontal distance between (v1-v4). * This is to prevent curve loops. * @@ -1555,9 +1558,13 @@ void BKE_fcurve_correct_bezpart(const float v1[2], float v2[2], float v3[2], con } } -/** Find roots of cubic equation (c0 x³ + c1 x² + c2 x + c3) +/** + . + * Find roots of cubic equation (c0 x³ + c1 x² + c2 x + c3) * \return number of roots in `o`. - * NOTE: it is up to the caller to allocate enough memory for `o`. */ + * + * \note it is up to the caller to allocate enough memory for `o`. + */ static int solve_cubic(double c0, double c1, double c2, double c3, float *o) { double a, b, c, p, q, d, t, phi; diff --git a/source/blender/blenkernel/intern/gpencil.c b/source/blender/blenkernel/intern/gpencil.c index 47b9a92d4bd..9c84d155330 100644 --- a/source/blender/blenkernel/intern/gpencil.c +++ b/source/blender/blenkernel/intern/gpencil.c @@ -1293,7 +1293,8 @@ bGPDframe *BKE_gpencil_layer_frame_find(bGPDlayer *gpl, int cframe) return NULL; } -/** Get the appropriate gp-frame from a given layer +/** + * Get the appropriate gp-frame from a given layer * - this sets the layer's actframe var (if allowed to) * - extension beyond range (if first gp-frame is after all frame in interest and cannot add) * diff --git a/source/blender/blenkernel/intern/gpencil_modifier.c b/source/blender/blenkernel/intern/gpencil_modifier.c index 6f1896f055a..1f13f008464 100644 --- a/source/blender/blenkernel/intern/gpencil_modifier.c +++ b/source/blender/blenkernel/intern/gpencil_modifier.c @@ -616,7 +616,8 @@ static int gpencil_remap_time_get(Depsgraph *depsgraph, Scene *scene, Object *ob return remap_cfra; } -/** Get the current frame re-timed with time modifiers. +/** + * Get the current frame re-timed with time modifiers. * \param depsgraph: Current depsgraph. * \param scene: Current scene * \param ob: Grease pencil object @@ -746,7 +747,8 @@ void BKE_gpencil_prepare_eval_data(Depsgraph *depsgraph, Scene *scene, Object *o BKE_gpencil_update_orig_pointers(ob_orig, ob); } -/** Calculate gpencil modifiers. +/** + * Calculate gpencil modifiers. * \param depsgraph: Current depsgraph * \param scene: Current scene * \param ob: Grease pencil object diff --git a/source/blender/blenkernel/intern/lib_override.c b/source/blender/blenkernel/intern/lib_override.c index 150b9ee8868..e42fab70af4 100644 --- a/source/blender/blenkernel/intern/lib_override.c +++ b/source/blender/blenkernel/intern/lib_override.c @@ -218,10 +218,12 @@ static ID *lib_override_library_create_from(Main *bmain, ID *reference_id) return local_id; } -/** Check if given ID has some override rules that actually indicate the user edited it. +/** + * Check if given ID has some override rules that actually indicate the user edited it. * - * TODO: This could be simplified by storing a flag in IDOverrideLibrary during the diffing - * process? */ + * TODO: This could be simplified by storing a flag in #IDOverrideLibrary during the diffing + * process? + */ bool BKE_lib_override_library_is_user_edited(struct ID *id) { if (!ID_IS_OVERRIDE_LIBRARY(id)) { @@ -2407,8 +2409,10 @@ ID *BKE_lib_override_library_operations_store_start(Main *bmain, return storage_id; } -/** Restore given ID modified by \a BKE_lib_override_library_operations_store_start, to its - * original state. */ +/** + * Restore given ID modified by #BKE_lib_override_library_operations_store_start, to its + * original state. + */ void BKE_lib_override_library_operations_store_end( OverrideLibraryStorage *UNUSED(override_storage), ID *local) { diff --git a/source/blender/blenkernel/intern/mesh_boolean_convert.cc b/source/blender/blenkernel/intern/mesh_boolean_convert.cc index ecf70c779e5..cfb1c192afe 100644 --- a/source/blender/blenkernel/intern/mesh_boolean_convert.cc +++ b/source/blender/blenkernel/intern/mesh_boolean_convert.cc @@ -231,7 +231,8 @@ const MEdge *MeshesToIMeshInfo::input_medge_for_orig_index(int orig_index, return medge; } -/** Convert all of the meshes in `meshes` to an `IMesh` and return that. +/** + * Convert all of the meshes in `meshes` to an `IMesh` and return that. * All of the coordinates are transformed into the local space of the * first Mesh. To do this transformation, we also need the transformation * obmats corresponding to the Meshes, so they are in the `obmats` argument. @@ -638,7 +639,8 @@ static void copy_or_interp_loop_attributes(Mesh *dest_mesh, } } -/** Make sure that there are custom data layers in the target mesh +/** + * Make sure that there are custom data layers in the target mesh * corresponding to all target layers in all of the operands after the first. * (The target should already have layers for those in the first operand mesh). * Edges done separately -- will have to be done later, after edges are made. @@ -673,7 +675,8 @@ static void merge_edge_customdata_layers(Mesh *target, MeshesToIMeshInfo &mim) } } -/** Convert the output IMesh im to a Blender Mesh, +/** + * Convert the output IMesh im to a Blender Mesh, * using the information in mim to get all the attributes right. */ static Mesh *imesh_to_mesh(IMesh *im, MeshesToIMeshInfo &mim) diff --git a/source/blender/blenkernel/intern/nla.c b/source/blender/blenkernel/intern/nla.c index 63b14c30b3c..97aa6b07ab0 100644 --- a/source/blender/blenkernel/intern/nla.c +++ b/source/blender/blenkernel/intern/nla.c @@ -434,8 +434,10 @@ NlaStrip *BKE_nla_add_soundstrip(Main *bmain, Scene *scene, Speaker *speaker) return strip; } -/** Callback used by lib_query to walk over all ID usages (mimics `foreach_id` callback of - * `IDTypeInfo` structure). */ +/** + * Callback used by lib_query to walk over all ID usages (mimics `foreach_id` callback of + * `IDTypeInfo` structure). + */ void BKE_nla_strip_foreach_id(NlaStrip *strip, LibraryForeachIDData *data) { BKE_LIB_FOREACHID_PROCESS(data, strip->act, IDWALK_CB_USER); @@ -1380,8 +1382,10 @@ static void nlastrip_fix_resize_overlaps(NlaStrip *strip) } } -/** Recalculate the start and end frames for the strip to match the bounds of its action such that - * the overall NLA animation result is unchanged. */ +/** + * Recalculate the start and end frames for the strip to match the bounds of its action such that + * the overall NLA animation result is unchanged. + */ void BKE_nlastrip_recalculate_bounds_sync_action(NlaStrip *strip) { float prev_actstart; diff --git a/source/blender/blenkernel/intern/node.cc b/source/blender/blenkernel/intern/node.cc index 0897ef7077e..52f6c4f93ad 100644 --- a/source/blender/blenkernel/intern/node.cc +++ b/source/blender/blenkernel/intern/node.cc @@ -3096,10 +3096,12 @@ void ntreeSetOutput(bNodeTree *ntree) * might be different for editor or for "real" use... */ } -/** Get address of potential nodetree pointer of given ID. +/** + * Get address of potential node-tree pointer of given ID. * * \warning Using this function directly is potentially dangerous, if you don't know or are not - * sure, please use `ntreeFromID()` instead. */ + * sure, please use `ntreeFromID()` instead. + */ bNodeTree **BKE_ntree_ptr_from_id(ID *id) { switch (GS(id->name)) { diff --git a/source/blender/blenkernel/intern/object.c b/source/blender/blenkernel/intern/object.c index 5ed12ec8688..d96942e47e7 100644 --- a/source/blender/blenkernel/intern/object.c +++ b/source/blender/blenkernel/intern/object.c @@ -1359,8 +1359,9 @@ static bool object_modifier_type_copy_check(ModifierType md_type) return !ELEM(md_type, eModifierType_Hook, eModifierType_Collision); } -/** Find a `psys` matching given `psys_src` in `ob_dst` (i.e. sharing the same ParticleSettings - * ID), or add one, and return valid `psys` from `ob_dst`. +/** + * Find a `psys` matching given `psys_src` in `ob_dst` (i.e. sharing the same ParticleSettings ID), + * or add one, and return valid `psys` from `ob_dst`. * * \note Order handling is fairly weak here. This code assumes that it is called **before** the * modifier using the psys is actually copied, and that this copied modifier will be added at the @@ -1392,7 +1393,8 @@ static ParticleSystem *object_copy_modifier_particle_system_ensure(Main *bmain, return psys_dst; } -/** Copy a single modifier. +/** + * Copy a single modifier. * * \note **Do not** use this function to copy a whole modifier stack (see note below too). Use * `BKE_object_modifier_stack_copy` instead. @@ -1400,7 +1402,8 @@ static ParticleSystem *object_copy_modifier_particle_system_ensure(Main *bmain, * \note Complex modifiers relaying on other data (like e.g. dynamic paint or fluid using particle * systems) are not always 100% 'correctly' copied here, since we have to use heuristics to decide * which particle system to use or add in `ob_dst`, and it's placement in the stack, etc. If used - * more than once, this function should preferably be called in stack order. */ + * more than once, this function should preferably be called in stack order. + */ bool BKE_object_copy_modifier( Main *bmain, Scene *scene, Object *ob_dst, const Object *ob_src, ModifierData *md_src) { @@ -1500,10 +1503,12 @@ bool BKE_object_copy_modifier( return true; } -/** Copy a single GPencil modifier. +/** + * Copy a single GPencil modifier. * * \note **Do not** use this function to copy a whole modifier stack. Use - * `BKE_object_modifier_stack_copy` instead. */ + * `BKE_object_modifier_stack_copy` instead. + */ bool BKE_object_copy_gpencil_modifier(struct Object *ob_dst, GpencilModifierData *gmd_src) { BLI_assert(ob_dst->type == OB_GPENCIL); diff --git a/source/blender/blenkernel/intern/text.c b/source/blender/blenkernel/intern/text.c index 43d587861a5..944e01321ce 100644 --- a/source/blender/blenkernel/intern/text.c +++ b/source/blender/blenkernel/intern/text.c @@ -523,7 +523,8 @@ Text *BKE_text_load_ex(Main *bmain, const char *file, const char *relpath, const return ta; } -/** Load a text file. +/** + * Load a text file. * * \note Text data-blocks have no user by default, only the 'real user' flag. */ |