diff options
author | Campbell Barton <ideasman42@gmail.com> | 2018-06-01 19:26:42 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2018-06-01 19:26:42 +0300 |
commit | bfe1d0e0dc6281d33448c3d4ddfa2e231bbc5566 (patch) | |
tree | 14e9db1c58d7ffc33becc3ff5d74f4feb4c2d75e /source/blender/makesdna | |
parent | 297bf7235bc4b2384b99f41676a8c217f2ee3249 (diff) | |
parent | 75fc1c35070e0cf247f2d2e4cffe8a6e711522ff (diff) |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/makesdna')
-rw-r--r-- | source/blender/makesdna/DNA_action_types.h | 30 | ||||
-rw-r--r-- | source/blender/makesdna/DNA_anim_types.h | 28 | ||||
-rw-r--r-- | source/blender/makesdna/DNA_constraint_types.h | 2 | ||||
-rw-r--r-- | source/blender/makesdna/DNA_curve_types.h | 2 | ||||
-rw-r--r-- | source/blender/makesdna/DNA_freestyle_types.h | 2 | ||||
-rw-r--r-- | source/blender/makesdna/DNA_gpencil_types.h | 2 | ||||
-rw-r--r-- | source/blender/makesdna/DNA_ipo_types.h | 2 | ||||
-rw-r--r-- | source/blender/makesdna/DNA_linestyle_types.h | 2 | ||||
-rw-r--r-- | source/blender/makesdna/DNA_node_types.h | 2 | ||||
-rw-r--r-- | source/blender/makesdna/DNA_vec_types.h | 2 | ||||
-rw-r--r-- | source/blender/makesdna/DNA_windowmanager_types.h | 4 | ||||
-rw-r--r-- | source/blender/makesdna/intern/makesdna.c | 10 |
12 files changed, 44 insertions, 44 deletions
diff --git a/source/blender/makesdna/DNA_action_types.h b/source/blender/makesdna/DNA_action_types.h index 4ad4ae97f1a..0568af454fc 100644 --- a/source/blender/makesdna/DNA_action_types.h +++ b/source/blender/makesdna/DNA_action_types.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 @@ -206,8 +206,8 @@ typedef struct bPoseChannelDrawData { /* PoseChannel * - * A PoseChannel stores the results of Actions and transform information - * with respect to the restposition of Armature bones + * A PoseChannel stores the results of Actions and transform information + * with respect to the restposition of Armature bones */ typedef struct bPoseChannel { struct bPoseChannel *next, *prev; @@ -499,14 +499,14 @@ typedef enum eItasc_Solver { /* Action-Channel Group (agrp) * - * These are stored as a list per-Action, and are only used to - * group that Action's channels in an Animation Editor. + * These are stored as a list per-Action, and are only used to + * group that Action's channels in an Animation Editor. * * Even though all FCurves live in a big list per Action, each group they are in also * holds references to the achans within that list which belong to it. Care must be taken to * ensure that action-groups never end up being the sole 'owner' of a channel. - * - * This is also exploited for bone-groups. Bone-Groups are stored per bPose, and are used + * + * This is also exploited for bone-groups. Bone-Groups are stored per bPose, and are used * primarily to color bones in the 3d-view. There are other benefits too, but those are mostly related * to Action-Groups. * @@ -553,13 +553,13 @@ typedef enum eActionGroup_Flag { /* Action - reusable F-Curve 'bag' (act) * - * This contains F-Curves that may affect settings from more than one ID blocktype and/or - * datablock (i.e. sub-data linked/used directly to the ID block that the animation data is linked to), + * This contains F-Curves that may affect settings from more than one ID blocktype and/or + * datablock (i.e. sub-data linked/used directly to the ID block that the animation data is linked to), * but with the restriction that the other unrelated data (i.e. data that is not directly used or linked to * by the source ID block). * - * It serves as a 'unit' of reusable animation information (i.e. keyframes/motion data), that - * affects a group of related settings (as defined by the user). + * It serves as a 'unit' of reusable animation information (i.e. keyframes/motion data), that + * affects a group of related settings (as defined by the user). */ typedef struct bAction { ID id; /* ID-serialisation for relinking */ @@ -774,14 +774,14 @@ typedef enum eTimeline_Cache_Flag { /* WARNING: Action Channels are now deprecated... they were part of the old animation system! * (ONLY USED FOR DO_VERSIONS...) - * - * Action Channels belong to Actions. They are linked with an IPO block, and can also own - * Constraint Channels in certain situations. + * + * Action Channels belong to Actions. They are linked with an IPO block, and can also own + * Constraint Channels in certain situations. * * Action-Channels can only belong to one group at a time, but they still live the Action's * list of achans (to preserve backwards compatibility, and also minimize the code * that would need to be recoded). Grouped achans are stored at the start of the list, according - * to the position of the group in the list, and their position within the group. + * to the position of the group in the list, and their position within the group. */ typedef struct bActionChannel { struct bActionChannel *next, *prev; diff --git a/source/blender/makesdna/DNA_anim_types.h b/source/blender/makesdna/DNA_anim_types.h index 242ff61c616..63dc8920a4b 100644 --- a/source/blender/makesdna/DNA_anim_types.h +++ b/source/blender/makesdna/DNA_anim_types.h @@ -47,7 +47,7 @@ extern "C" { /* F-Curve Modifiers (fcm) * * These alter the way F-Curves behave, by altering the value that is returned - * when evaluating the curve's data at some time (t). + * when evaluating the curve's data at some time (t). */ typedef struct FModifier { struct FModifier *next, *prev; @@ -134,7 +134,7 @@ typedef enum eFMod_Generator_Flags { /* 'Built-In Function' Generator modifier data - * + * * This uses the general equation for equations: * y = amplitude * fn(phase_multiplier*x + phase_offset) + y_offset * @@ -397,14 +397,14 @@ typedef enum eDriverVar_Flags { /* Channel Driver (i.e. Drivers / Expressions) (driver) * - * Channel Drivers are part of the dependency system, and are executed in addition to + * Channel Drivers are part of the dependency system, and are executed in addition to * normal user-defined animation. They take the animation result of some channel(s), and * use that (optionally combined with its own F-Curve for modification of results) to define * the value of some setting semi-procedurally. * * Drivers are stored as part of F-Curve data, so that the F-Curve's RNA-path settings (for storing * what setting the driver will affect). The order in which they are stored defines the order that they're - * evaluated in. This order is set by the Depsgraph's sorting stuff. + * evaluated in. This order is set by the Depsgraph's sorting stuff. */ typedef struct ChannelDriver { ListBase variables; /* targets for this driver (i.e. list of DriverVar) */ @@ -583,8 +583,8 @@ typedef struct AnimMapPair { /* Retargetting Information for Actions * - * This should only be used if it is strictly necessary (i.e. user will need to explicitly - * add this when they find that some channels do not match, or motion is not going to right + * This should only be used if it is strictly necessary (i.e. user will need to explicitly + * add this when they find that some channels do not match, or motion is not going to right * places). When executing an action, this will be checked to see if it provides any useful * remaps for the given paths. * @@ -607,7 +607,7 @@ typedef struct AnimMapper { /* NLA Strip (strip) * * A NLA Strip is a container for the reuse of Action data, defining parameters - * to control the remapping of the Action data to some destination. + * to control the remapping of the Action data to some destination. */ typedef struct NlaStrip { struct NlaStrip *next, *prev; @@ -716,7 +716,7 @@ typedef enum eNlaStrip_Type { /* NLA Track (nlt) * - * A track groups a bunch of 'strips', which should form a continuous set of + * A track groups a bunch of 'strips', which should form a continuous set of * motion, on top of which other such groups can be layered. This should allow * for animators to work in a non-destructive manner, layering tweaks, etc. over * 'rough' blocks of their work. @@ -759,7 +759,7 @@ typedef enum eNlaTrack_Flag { * dynamic data-block - such as PoseChannels - to act upon, ala * Maya's 'Character Sets' and XSI's 'Marking Sets'), or they may * be generic (using various placeholder template tags that will be - * replaced with appropriate information from the context). + * replaced with appropriate information from the context). */ typedef struct KS_Path { struct KS_Path *next, *prev; @@ -807,7 +807,7 @@ typedef enum eKSP_Grouping { * be keyframed together, providing a convenient way for animators * to insert keyframes without resorting to Auto-Keyframing. * - * A few 'generic' (non-absolute and dependent on templates) KeyingSets + * A few 'generic' (non-absolute and dependent on templates) KeyingSets * are defined 'built-in' to facilitate easy animating for the casual * animator without the need to add extra steps to the rigging process. */ @@ -864,7 +864,7 @@ typedef enum eInsertKeyFlags { * * This is used to as temporary storage of values which have been changed by the user, but not * yet keyframed (thus, would get overwritten by the animation system before the user had a chance - * to see the changes that were made). + * to see the changes that were made). * * It is probably not needed for overriding keyframed values in most cases, as those will only get evaluated * on frame-change now. That situation may change in future. @@ -881,11 +881,11 @@ typedef struct AnimOverride { /* AnimData ------------------------------------- */ /* Animation data for some ID block (adt) - * + * * This block of data is used to provide all of the necessary animation data for a datablock. * Currently, this data will not be reusable, as there shouldn't be any need to do so. - * - * This information should be made available for most if not all ID-blocks, which should + * + * This information should be made available for most if not all ID-blocks, which should * enable all of its settings to be animatable locally. Animation from 'higher-up' ID-AnimData * blocks may override local settings. * diff --git a/source/blender/makesdna/DNA_constraint_types.h b/source/blender/makesdna/DNA_constraint_types.h index f0f8c3fe2bd..6f6ce7d08db 100644 --- a/source/blender/makesdna/DNA_constraint_types.h +++ b/source/blender/makesdna/DNA_constraint_types.h @@ -157,7 +157,7 @@ typedef enum eConstraint_IK_Type { /* Spline IK Constraint * Aligns 'n' bones to the curvature defined by the curve, - * with the chain ending on the bone that owns this constraint, + * with the chain ending on the bone that owns this constraint, * and starting on the nth parent. */ typedef struct bSplineIKConstraint { diff --git a/source/blender/makesdna/DNA_curve_types.h b/source/blender/makesdna/DNA_curve_types.h index fd0170b9766..f1b0c32e53b 100644 --- a/source/blender/makesdna/DNA_curve_types.h +++ b/source/blender/makesdna/DNA_curve_types.h @@ -92,7 +92,7 @@ typedef struct BevList { /** * Keyframes on F-Curves (allows code reuse of Bezier eval code) and - * Points on Bezier Curves/Paths are generally BezTriples + * Points on Bezier Curves/Paths are generally BezTriples * * \note alfa location in struct is abused by Key system * diff --git a/source/blender/makesdna/DNA_freestyle_types.h b/source/blender/makesdna/DNA_freestyle_types.h index 158bdf573b3..36cf151b76e 100644 --- a/source/blender/makesdna/DNA_freestyle_types.h +++ b/source/blender/makesdna/DNA_freestyle_types.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/makesdna/DNA_gpencil_types.h b/source/blender/makesdna/DNA_gpencil_types.h index d5a5a1d5d4a..c7ca92ba5cc 100644 --- a/source/blender/makesdna/DNA_gpencil_types.h +++ b/source/blender/makesdna/DNA_gpencil_types.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/makesdna/DNA_ipo_types.h b/source/blender/makesdna/DNA_ipo_types.h index 374104d8b13..5ba822616eb 100644 --- a/source/blender/makesdna/DNA_ipo_types.h +++ b/source/blender/makesdna/DNA_ipo_types.h @@ -29,7 +29,7 @@ * \ingroup DNA * \deprecated * The contents of this file are now officially deprecated. They were used for the 'old' animation system, - * which has (as of 2.50) been replaced with a completely new system by Joshua Leung (aligorith). All defines, + * which has (as of 2.50) been replaced with a completely new system by Joshua Leung (aligorith). All defines, * etc. are only still maintained to provide backwards compatibility for old files. */ diff --git a/source/blender/makesdna/DNA_linestyle_types.h b/source/blender/makesdna/DNA_linestyle_types.h index f9b9f8a4641..fa9ce358549 100644 --- a/source/blender/makesdna/DNA_linestyle_types.h +++ b/source/blender/makesdna/DNA_linestyle_types.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/makesdna/DNA_node_types.h b/source/blender/makesdna/DNA_node_types.h index af1045ee059..7d8d1883100 100644 --- a/source/blender/makesdna/DNA_node_types.h +++ b/source/blender/makesdna/DNA_node_types.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/makesdna/DNA_vec_types.h b/source/blender/makesdna/DNA_vec_types.h index 1420ca48c22..7ec259370b5 100644 --- a/source/blender/makesdna/DNA_vec_types.h +++ b/source/blender/makesdna/DNA_vec_types.h @@ -23,7 +23,7 @@ * Contributor(s): none yet. * * ***** END GPL LICENSE BLOCK ***** - * + * */ /** \file DNA_vec_types.h diff --git a/source/blender/makesdna/DNA_windowmanager_types.h b/source/blender/makesdna/DNA_windowmanager_types.h index 7d7fa5fcf23..6d5d2c380e2 100644 --- a/source/blender/makesdna/DNA_windowmanager_types.h +++ b/source/blender/makesdna/DNA_windowmanager_types.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) 2007 Blender Foundation. * All rights reserved. * - * + * * Contributor(s): Blender Foundation * * ***** END GPL LICENSE BLOCK ***** diff --git a/source/blender/makesdna/intern/makesdna.c b/source/blender/makesdna/intern/makesdna.c index c1f8341ddc6..b0da028127c 100644 --- a/source/blender/makesdna/intern/makesdna.c +++ b/source/blender/makesdna/intern/makesdna.c @@ -172,7 +172,7 @@ static int additional_slen_offset; static int add_type(const char *str, int len); /** - * Add variable \c str to + * Add variable \c str to * \param str */ static int add_name(const char *str); @@ -191,22 +191,22 @@ static int preprocess_include(char *maindata, int len); /** * Scan this file for serializable types. - */ + */ static int convert_include(const char *filename); /** * Determine how many bytes are needed for an array. - */ + */ static int arraysize(const char *str); /** * Determine how many bytes are needed for each struct. - */ + */ static int calculate_structlens(int); /** * Construct the DNA.c file - */ + */ static void dna_write(FILE *file, const void *pntr, const int size); /** |