[Bf-blender-cvs] [78fbd146f3c] master: Cleanup: trailing space for DNA headers
Campbell Barton
noreply at git.blender.org
Sun Jun 17 17:07:09 CEST 2018
Commit: 78fbd146f3cd9a5c97307ff6f2d14422e7ae54b9
Author: Campbell Barton
Date: Sun Jun 17 17:04:09 2018 +0200
Branches: master
https://developer.blender.org/rB78fbd146f3cd9a5c97307ff6f2d14422e7ae54b9
Cleanup: trailing space for DNA headers
===================================================================
M source/blender/makesdna/DNA_ID.h
M source/blender/makesdna/DNA_action_types.h
M source/blender/makesdna/DNA_actuator_types.h
M source/blender/makesdna/DNA_anim_types.h
M source/blender/makesdna/DNA_armature_types.h
M source/blender/makesdna/DNA_boid_types.h
M source/blender/makesdna/DNA_camera_types.h
M source/blender/makesdna/DNA_cloth_types.h
M source/blender/makesdna/DNA_color_types.h
M source/blender/makesdna/DNA_constraint_types.h
M source/blender/makesdna/DNA_controller_types.h
M source/blender/makesdna/DNA_curve_types.h
M source/blender/makesdna/DNA_dynamicpaint_types.h
M source/blender/makesdna/DNA_effect_types.h
M source/blender/makesdna/DNA_gpencil_types.h
M source/blender/makesdna/DNA_group_types.h
M source/blender/makesdna/DNA_image_types.h
M source/blender/makesdna/DNA_ipo_types.h
M source/blender/makesdna/DNA_key_types.h
M source/blender/makesdna/DNA_lamp_types.h
M source/blender/makesdna/DNA_lattice_types.h
M source/blender/makesdna/DNA_material_types.h
M source/blender/makesdna/DNA_mesh_types.h
M source/blender/makesdna/DNA_meshdata_types.h
M source/blender/makesdna/DNA_meta_types.h
M source/blender/makesdna/DNA_modifier_types.h
M source/blender/makesdna/DNA_nla_types.h
M source/blender/makesdna/DNA_node_types.h
M source/blender/makesdna/DNA_object_fluidsim_types.h
M source/blender/makesdna/DNA_object_force_types.h
M source/blender/makesdna/DNA_object_types.h
M source/blender/makesdna/DNA_particle_types.h
M source/blender/makesdna/DNA_property_types.h
M source/blender/makesdna/DNA_rigidbody_types.h
M source/blender/makesdna/DNA_scene_types.h
M source/blender/makesdna/DNA_screen_types.h
M source/blender/makesdna/DNA_sensor_types.h
M source/blender/makesdna/DNA_sequence_types.h
M source/blender/makesdna/DNA_smoke_types.h
M source/blender/makesdna/DNA_speaker_types.h
M source/blender/makesdna/DNA_text_types.h
M source/blender/makesdna/DNA_texture_types.h
M source/blender/makesdna/DNA_userdef_types.h
M source/blender/makesdna/DNA_vfont_types.h
M source/blender/makesdna/DNA_view2d_types.h
M source/blender/makesdna/DNA_view3d_types.h
M source/blender/makesdna/DNA_windowmanager_types.h
M source/blender/makesdna/DNA_world_types.h
M source/blender/makesdna/intern/dna_genfile.c
M source/blender/makesdna/intern/makesdna.c
===================================================================
diff --git a/source/blender/makesdna/DNA_ID.h b/source/blender/makesdna/DNA_ID.h
index c632b87752b..0c7341b0fae 100644
--- a/source/blender/makesdna/DNA_ID.h
+++ b/source/blender/makesdna/DNA_ID.h
@@ -153,7 +153,7 @@ typedef struct Library {
char filepath[1024];
struct Library *parent; /* set for indirectly linked libs, used in the outliner and while reading */
-
+
struct PackedFile *packedfile;
/* Temp data needed by read/write code. */
diff --git a/source/blender/makesdna/DNA_action_types.h b/source/blender/makesdna/DNA_action_types.h
index 0e13aff4d44..e255b85ebe3 100644
--- a/source/blender/makesdna/DNA_action_types.h
+++ b/source/blender/makesdna/DNA_action_types.h
@@ -72,10 +72,10 @@ typedef enum eMotionPathVert_Flag {
typedef struct bMotionPath {
bMotionPathVert *points; /* path samples */
int length; /* the number of cached verts */
-
+
int start_frame; /* for drawing paths, the start frame number */
int end_frame; /* for drawing paths, the end frame number */
-
+
float color[3]; /* optional custom color */
int line_thickness; /* line thickness */
int flag; /* baking settings - eMotionPath_Flag */
@@ -90,7 +90,7 @@ typedef enum eMotionPath_Flag {
/* Custom colors */
MOTIONPATH_FLAG_CUSTOM = (1 << 2),
/* Draw lines or only points */
- MOTIONPATH_FLAG_LINES = (1 << 3)
+ MOTIONPATH_FLAG_LINES = (1 << 3)
} eMotionPath_Flag;
/* Visualization General --------------------------- */
@@ -101,22 +101,22 @@ typedef struct bAnimVizSettings {
/* Onion-Skinning Settings ----------------- */
int ghost_sf, ghost_ef; /* start and end frames of ghost-drawing range (only used for GHOST_TYPE_RANGE) */
int ghost_bc, ghost_ac; /* number of frames before/after current frame to show */
-
+
short ghost_type; /* eOnionSkin_Types */
short ghost_step; /* number of frames between each ghost shown (not for GHOST_TYPE_KEYS) */
-
+
short ghost_flag; /* eOnionSkin_Flag */
-
+
/* General Settings ------------------------ */
short recalc; /* eAnimViz_RecalcFlags */
-
+
/* Motion Path Settings ------------------- */
short path_type; /* eMotionPath_Types */
short path_step; /* number of frames between points indicated on the paths */
-
+
short path_viewflag; /* eMotionPaths_ViewFlag */
short path_bakeflag; /* eMotionPaths_BakeFlag */
-
+
int path_sf, path_ef; /* start and end frames of path-calculation range */
int path_bc, path_ac; /* number of frames before/after current frame to show */
} bAnimVizSettings;
@@ -185,19 +185,19 @@ typedef enum eMotionPaths_BakeFlag {
/* PoseChannel ------------------------------------ */
-/* PoseChannel
+/* PoseChannel
*
* 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;
-
+
IDProperty *prop; /* User-Defined Properties on this PoseChannel */
-
+
ListBase constraints; /* Constraints that act on this PoseChannel */
char name[64]; /* need to match bone name length: MAXBONENAME */
-
+
short flag; /* dynamic, for detecting transform changes */
short ikflag; /* settings for IK bones */
short protectflag; /* protect channels from being transformed */
@@ -234,32 +234,32 @@ typedef struct bPoseChannel {
float rotAxis[3], rotAngle; /* axis-angle rotation */
short rotmode; /* eRotationModes - rotation representation to use */
short pad;
-
+
float chan_mat[4][4]; /* matrix result of loc/quat/size, and where we put deform in, see next line */
float pose_mat[4][4]; /* constraints accumulate here. in the end, pose_mat = bone->arm_mat * chan_mat
* this matrix is object space */
float constinv[4][4]; /* inverse result of constraints.
* doesn't include effect of restposition, parent, and local transform*/
-
+
float pose_head[3]; /* actually pose_mat[3] */
float pose_tail[3]; /* also used for drawing help lines... */
-
+
float limitmin[3], limitmax[3]; /* DOF constraint, note! - these are stored in degrees, not radians */
float stiffness[3]; /* DOF stiffness */
float ikstretch;
float ikrotweight; /* weight of joint rotation constraint */
float iklinweight; /* weight of joint stretch constraint */
-
+
/* curved bones settings - these are for animating, and are applied on top of the copies in pchan->bone */
float roll1, roll2;
float curveInX, curveInY;
float curveOutX, curveOutY;
float ease1, ease2;
float scaleIn, scaleOut;
-
+
struct bPoseChannel *bbone_prev; /* next/prev bones to use as handle references when calculating bbones (optional) */
struct bPoseChannel *bbone_next;
-
+
void *temp; /* use for outliner */
} bPoseChannel;
@@ -270,16 +270,16 @@ typedef enum ePchan_Flag {
POSE_LOC = (1 << 0),
POSE_ROT = (1 << 1),
POSE_SIZE = (1 << 2),
-
+
/* old IK/cache stuff
- * - used to be here from (1 << 3) to (1 << 8)
+ * - used to be here from (1 << 3) to (1 << 8)
* but has been repurposed since 2.77.2
* as they haven't been used in over 10 years
*/
-
+
/* has BBone deforms */
POSE_BBONE_SHAPE = (1 << 3),
-
+
/* IK/Pose solving */
POSE_CHAIN = (1 << 9),
POSE_DONE = (1 << 10),
@@ -357,8 +357,8 @@ typedef enum eRotationModes {
ROT_MODE_YZX = 4,
ROT_MODE_ZXY = 5,
ROT_MODE_ZYX = 6,
- /* NOTE: space is reserved here for 18 other possible
- * euler rotation orders not implemented
+ /* NOTE: space is reserved here for 18 other possible
+ * euler rotation orders not implemented
*/
/* axis angle rotations */
ROT_MODE_AXISANGLE = -1,
@@ -369,7 +369,7 @@ typedef enum eRotationModes {
/* Pose ------------------------------------ */
-/* Pose-Object.
+/* Pose-Object.
*
* It is only found under ob->pose. It is not library data, even
* though there is a define for it (hack for the outliner).
@@ -386,19 +386,19 @@ typedef struct bPose {
short flag, pad;
unsigned int proxy_layer; /* proxy layer: copy from armature, gets synced */
int pad1;
-
+
float ctime; /* local action time of this pose */
float stride_offset[3]; /* applied to object */
float cyclic_offset[3]; /* result of match and cycles, applied in BKE_pose_where_is() */
-
-
+
+
ListBase agroups; /* list of bActionGroups */
-
+
int active_group; /* index of active group (starts from 1) */
int iksolver; /* ik solver to use, see ePose_IKSolverType */
void *ikdata; /* temporary IK data, depends on the IK solver. Not saved in file */
void *ikparam; /* IK solver parameters, structure depends on iksolver */
-
+
bAnimVizSettings avs; /* settings for visualization of bone animation */
char proxy_act_bone[64]; /* proxy active bone name, MAXBONENAME */
} bPose;
@@ -489,13 +489,13 @@ typedef enum eItasc_Solver {
*/
typedef struct bActionGroup {
struct bActionGroup *next, *prev;
-
+
ListBase channels; /* Note: this must not be touched by standard listbase functions which would clear links to other channels */
-
+
int flag; /* settings for this action-group */
int customCol; /* index of custom color set to use when used for bones (0=default - used for all old files, -1=custom set) */
char name[64]; /* name of the group */
-
+
ThemeWireColor cs; /* color set to use when customCol == -1 */
} bActionGroup;
@@ -518,7 +518,7 @@ typedef enum eActionGroup_Flag {
/* sub channel modifiers off */
AGRP_MODIFIERS_OFF = (1 << 7),
-
+
AGRP_TEMP = (1 << 30),
AGRP_MOVED = (1u << 31)
} eActionGroup_Flag;
@@ -526,7 +526,7 @@ typedef enum eActionGroup_Flag {
/* Actions -------------------------------------- */
-/* Action - reusable F-Curve 'bag' (act)
+/* 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),
@@ -538,15 +538,15 @@ typedef enum eActionGroup_Flag {
*/
typedef struct bAction {
ID id; /* ID-serialisation for relinking */
-
+
ListBase curves; /* function-curves (FCurve) */
ListBase chanbase DNA_DEPRECATED; /* legacy data - Action Channels (bActionChannel) in pre-2.5 animation system */
ListBase groups; /* groups of function-curves (bActionGroup) */
ListBase markers; /* markers local to the Action (used to provide Pose-Libraries) */
-
+
int flag; /* settings for this action */
int active_marker; /* index of the active marker */
-
+
int idroot; /* type of ID-blocks that action can be assigned to (if 0, will be set to whatever ID first evaluates it) */
int pad;
} bAction;
@@ -572,13 +572,13 @@ typedef enum eAction_Flags {
typedef struct bDopeSheet {
ID *source; /* currently ID_SCE (for Dopesheet), and ID_SC (for Grease Pencil) */
ListBase chanbase; /* cache for channels (only initialized when pinned) */ // XXX not used!
-
+
struct Group *filter_grp; /* object group for ADS_FILTER_ONLYOBGROUP filtering option */
char searchstr[64]; /* string to search for in displayed names of F-Curves for ADS_FILTER_BY_FCU_NAME filtering option */
-
+
int filterflag; /* flags to use for filtering data */
int flag; /* standard flags */
-
+
int renameIndex; /* index+1 of channel to rename - only gets set by renaming operator */
int pad;
} bDopeSheet;
@@ -588,7 +588,7 @@ typedef struct bDopeSheet {
typedef enum eDopeSheet_FilterFlag {
/* genera
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list