From 0d21228dce0079c592c9dd445fb112d59dd4c9e6 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Wed, 12 May 2021 16:44:59 +1000 Subject: Cleanup: rename 'rt' to '_pad#' in DNA structs --- source/blender/makesdna/DNA_boid_types.h | 5 +++-- source/blender/makesdna/DNA_effect_types.h | 9 ++++++--- source/blender/makesdna/DNA_ipo_types.h | 5 +++-- source/blender/makesdna/DNA_object_force_types.h | 4 ++-- source/blender/makesdna/DNA_particle_types.h | 10 ++++++---- source/blender/makesdna/DNA_pointcache_types.h | 3 ++- source/blender/makesdna/DNA_scene_types.h | 6 ++++-- source/blender/makesdna/DNA_texture_types.h | 3 ++- 8 files changed, 28 insertions(+), 17 deletions(-) (limited to 'source') diff --git a/source/blender/makesdna/DNA_boid_types.h b/source/blender/makesdna/DNA_boid_types.h index 882d4eb1b3b..540446ccd9d 100644 --- a/source/blender/makesdna/DNA_boid_types.h +++ b/source/blender/makesdna/DNA_boid_types.h @@ -97,7 +97,8 @@ typedef struct BoidRuleFollowLeader { } BoidRuleFollowLeader; typedef struct BoidRuleAverageSpeed { BoidRule rule; - float wander, level, speed, rt; + float wander, level, speed; + char _pad0[4]; } BoidRuleAverageSpeed; typedef struct BoidRuleFight { BoidRule rule; @@ -178,7 +179,7 @@ typedef struct BoidState { //} BoidSignal; // typedef struct BoidSignalDefine { // struct BoidSignalDefine *next, *prev; -// int id, rt; +// int id, _pad[4]; // char name[32]; //} BoidSignalDefine; diff --git a/source/blender/makesdna/DNA_effect_types.h b/source/blender/makesdna/DNA_effect_types.h index 33f2e1b47c0..307a212a139 100644 --- a/source/blender/makesdna/DNA_effect_types.h +++ b/source/blender/makesdna/DNA_effect_types.h @@ -71,13 +71,15 @@ extern "C" { typedef struct Effect { struct Effect *next, *prev; - short type, flag, buttype, rt; + short type, flag, buttype; + char _pad0[2]; } Effect; typedef struct BuildEff { struct BuildEff *next, *prev; - short type, flag, buttype, rt; + short type, flag, buttype; + char _pad0[2]; float len, sfra; @@ -88,7 +90,8 @@ typedef struct BuildEff { typedef struct Particle { float co[3], no[3]; float time, lifetime; - short mat_nr, rt; + short mat_nr; + char _pad0[2]; } Particle; struct Collection; diff --git a/source/blender/makesdna/DNA_ipo_types.h b/source/blender/makesdna/DNA_ipo_types.h index 8bb94976414..c5e207c4e20 100644 --- a/source/blender/makesdna/DNA_ipo_types.h +++ b/source/blender/makesdna/DNA_ipo_types.h @@ -77,8 +77,9 @@ typedef struct IpoCurve { short totvert; /** Interpolation and extrapolation modes . */ short ipo, extrap; - /** Flag= settings; rt= ???. */ - short flag, rt; + /** Flag= settings. */ + short flag; + char _pad0[2]; /** Minimum/maximum y-extents for curve. */ float ymin, ymax; /** ???. */ diff --git a/source/blender/makesdna/DNA_object_force_types.h b/source/blender/makesdna/DNA_object_force_types.h index 4673e61126b..3d8418fb734 100644 --- a/source/blender/makesdna/DNA_object_force_types.h +++ b/source/blender/makesdna/DNA_object_force_types.h @@ -182,8 +182,8 @@ typedef struct EffectorWeights { /** Effector type specific weights. */ float weight[14]; float global_gravity; - short flag, rt[3]; - char _pad[4]; + short flag; + char _pad[2]; } EffectorWeights; /* EffectorWeights->flag */ diff --git a/source/blender/makesdna/DNA_particle_types.h b/source/blender/makesdna/DNA_particle_types.h index cc40e26b92b..30b1fbe09d3 100644 --- a/source/blender/makesdna/DNA_particle_types.h +++ b/source/blender/makesdna/DNA_particle_types.h @@ -64,7 +64,7 @@ typedef struct BoidParticle { struct BoidData data; float gravity[3]; float wander[3]; - float rt; + char _pad0[4]; } BoidParticle; typedef struct ParticleSpring { @@ -82,7 +82,7 @@ typedef struct ChildParticle { float w[4]; /** Face vertex weights and offset. */ float fuv[4], foffset; - float rt; + char _pad0[4]; } ChildParticle; typedef struct ParticleTarget { @@ -99,7 +99,8 @@ typedef struct ParticleDupliWeight { short count; short flag; /** Only updated on file save and used on file load. */ - short index, rt; + short index; + char _pad0[2]; } ParticleDupliWeight; typedef struct ParticleData { @@ -191,7 +192,8 @@ typedef struct ParticleSettings { struct EffectorWeights *effector_weights; struct Collection *collision_group; - int flag, rt; + int flag; + char _pad1[4]; short type, from, distr, texact; /* physics modes */ short phystype, rotmode, avemode, reactevent; diff --git a/source/blender/makesdna/DNA_pointcache_types.h b/source/blender/makesdna/DNA_pointcache_types.h index de2fa3f10fe..ad5f386bf2b 100644 --- a/source/blender/makesdna/DNA_pointcache_types.h +++ b/source/blender/makesdna/DNA_pointcache_types.h @@ -107,7 +107,8 @@ typedef struct PointCache { int totpoint; /** Modifier stack index. */ int index; - short compression, rt; + short compression; + char _pad0[2]; char name[64]; char prev_name[64]; diff --git a/source/blender/makesdna/DNA_scene_types.h b/source/blender/makesdna/DNA_scene_types.h index c7f7e610a1a..0b07b8271a5 100644 --- a/source/blender/makesdna/DNA_scene_types.h +++ b/source/blender/makesdna/DNA_scene_types.h @@ -952,7 +952,8 @@ typedef struct ParticleEditSettings { /** Runtime. */ void *paintcursor; - float emitterdist, rt; + float emitterdist; + char _pad0[4]; int selectmode; int edittype; @@ -1550,7 +1551,8 @@ typedef struct UnitSettings { typedef struct PhysicsSettings { float gravity[3]; - int flag, quick_cache_step, rt; + int flag, quick_cache_step; + char _pad0[4]; } PhysicsSettings; /* ------------------------------------------- */ diff --git a/source/blender/makesdna/DNA_texture_types.h b/source/blender/makesdna/DNA_texture_types.h index 5381c524e4d..60c255e8637 100644 --- a/source/blender/makesdna/DNA_texture_types.h +++ b/source/blender/makesdna/DNA_texture_types.h @@ -57,7 +57,8 @@ typedef struct MTex { short colormodel, pmapto, pmaptoneg; short normapspace, which_output; float r, g, b, k; - float def_var, rt; + float def_var; + char _pad1[4]; /* common */ float colfac, varfac; -- cgit v1.2.3