diff options
author | Campbell Barton <ideasman42@gmail.com> | 2019-02-17 11:00:54 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2019-02-17 11:00:54 +0300 |
commit | 319b9d6501f2170dcf06b10de0add340d0be83a3 (patch) | |
tree | d43beea169beef1fae3c2f253e4aab7fc116bad8 /source/blender/makesdna | |
parent | 19a703b0db1687aac2e887f32b225e897a3fac88 (diff) |
DNA: rename dup_* struct members to instance_*
Diffstat (limited to 'source/blender/makesdna')
-rw-r--r-- | source/blender/makesdna/DNA_object_types.h | 4 | ||||
-rw-r--r-- | source/blender/makesdna/DNA_particle_types.h | 12 | ||||
-rw-r--r-- | source/blender/makesdna/intern/dna_rename_defs.h | 6 |
3 files changed, 13 insertions, 9 deletions
diff --git a/source/blender/makesdna/DNA_object_types.h b/source/blender/makesdna/DNA_object_types.h index b79009e9d1d..7e94b469d77 100644 --- a/source/blender/makesdna/DNA_object_types.h +++ b/source/blender/makesdna/DNA_object_types.h @@ -304,7 +304,7 @@ typedef struct Object { char empty_drawtype; float empty_drawsize; /** Dupliface scale. */ - float dupfacesca; + float instance_faces_scale; /** Custom index, for renderpasses. */ short index; @@ -335,7 +335,7 @@ typedef struct Object { /** If exists, saved in file. */ struct SoftBody *soft; /** Object duplicator for group. */ - struct Collection *dup_group; + struct Collection *instance_collection; void *pad10; char pad4; diff --git a/source/blender/makesdna/DNA_particle_types.h b/source/blender/makesdna/DNA_particle_types.h index e0c799a13fe..2396a379379 100644 --- a/source/blender/makesdna/DNA_particle_types.h +++ b/source/blender/makesdna/DNA_particle_types.h @@ -267,10 +267,10 @@ typedef struct ParticleSettings { /** MAX_MTEX. */ struct MTex *mtex[18]; - struct Collection *dup_group; - struct ListBase dupliweights; + struct Collection *instance_collection; + struct ListBase instance_weights; struct Collection *eff_group DNA_DEPRECATED; // deprecated - struct Object *dup_ob; + struct Object *instance_object; struct Object *bb_ob; /** Old animation system, deprecated for 2.5. */ struct Ipo *ipo DNA_DEPRECATED; @@ -343,7 +343,7 @@ typedef struct ParticleSystem { /** Particle system name, MAX_NAME. */ char name[64]; - /** Used for duplicators. */ + /** Used for instancing. */ float imat[4][4]; float cfra, tree_frame, bvhtree_frame; int seed, child_seed; @@ -409,7 +409,7 @@ typedef enum eParticleDrawFlag { PART_ABS_PATH_TIME = (1 << 5), PART_DRAW_COUNT_GR = (1 << 6), PART_DRAW_BB_LOCK = (1 << 7), /* used with billboards */ - PART_DRAW_ROTATE_OB = (1 << 7), /* used with dupliobjects/groups */ + PART_DRAW_ROTATE_OB = (1 << 7), /* used with instance object/collection */ PART_DRAW_PARENT = (1 << 8), PART_DRAW_NUM = (1 << 9), PART_DRAW_RAND_GR = (1 << 10), @@ -418,7 +418,7 @@ typedef enum eParticleDrawFlag { PART_DRAW_MAT_COL = (1 << 13), /* deprecated, but used in do_versions */ PART_DRAW_WHOLE_GR = (1 << 14), PART_DRAW_REN_STRAND = (1 << 15), - PART_DRAW_NO_SCALE_OB = (1 << 16), /* used with dupliobjects/groups */ + PART_DRAW_NO_SCALE_OB = (1 << 16), /* used with instance object/collection */ PART_DRAW_GUIDE_HAIRS = (1 << 17), PART_DRAW_HAIR_GRID = (1 << 18), } eParticleDrawFlag; diff --git a/source/blender/makesdna/intern/dna_rename_defs.h b/source/blender/makesdna/intern/dna_rename_defs.h index babb2bd79b6..0b21fb8420b 100644 --- a/source/blender/makesdna/intern/dna_rename_defs.h +++ b/source/blender/makesdna/intern/dna_rename_defs.h @@ -49,6 +49,11 @@ DNA_STRUCT_RENAME(SpaceOops, SpaceOutliner) DNA_STRUCT_RENAME_ELEM(Camera, YF_dofdist, dof_distance) DNA_STRUCT_RENAME_ELEM(Camera, clipend, clip_end) DNA_STRUCT_RENAME_ELEM(Camera, clipsta, clip_start) +DNA_STRUCT_RENAME_ELEM(Object, dup_group, instance_collection) +DNA_STRUCT_RENAME_ELEM(Object, dupfacesca, instance_faces_scale) +DNA_STRUCT_RENAME_ELEM(ParticleSettings, dup_group, instance_collection) +DNA_STRUCT_RENAME_ELEM(ParticleSettings, dup_ob, instance_object) +DNA_STRUCT_RENAME_ELEM(ParticleSettings, dupliweights, instance_weights) DNA_STRUCT_RENAME_ELEM(View3D, far, clip_end) DNA_STRUCT_RENAME_ELEM(View3D, near, clip_start) DNA_STRUCT_RENAME_ELEM(bTheme, tact, space_action) @@ -71,5 +76,4 @@ DNA_STRUCT_RENAME_ELEM(bTheme, tv3d, space_view3d) #if 0 DNA_STRUCT_RENAME(Lamp, Light) -DNA_STRUCT_RENAME_ELEM(Object, dup_group, instance_collection) #endif |