diff options
author | Campbell Barton <campbell@blender.org> | 2022-03-25 04:04:21 +0300 |
---|---|---|
committer | Campbell Barton <campbell@blender.org> | 2022-03-25 04:10:21 +0300 |
commit | 7d1d9e601503fb7e921c935524fec1469363c121 (patch) | |
tree | d19dcbbcf9ada051ff3ec629c397ddca23eb2b55 /source/blender/makesdna | |
parent | 4d46fac65d9946382c4be5b3842660e77468f00b (diff) |
Cleanup: rename ParticleSettings.child_nbr => child_percent
child_nbr was used as a percentage as well as the final
number of particles. Rename to avoid confusion.
Diffstat (limited to 'source/blender/makesdna')
-rw-r--r-- | source/blender/makesdna/DNA_particle_defaults.h | 4 | ||||
-rw-r--r-- | source/blender/makesdna/DNA_particle_types.h | 2 | ||||
-rw-r--r-- | source/blender/makesdna/intern/dna_rename_defs.h | 2 |
3 files changed, 5 insertions, 3 deletions
diff --git a/source/blender/makesdna/DNA_particle_defaults.h b/source/blender/makesdna/DNA_particle_defaults.h index 138aa6f1f98..108252a5e6c 100644 --- a/source/blender/makesdna/DNA_particle_defaults.h +++ b/source/blender/makesdna/DNA_particle_defaults.h @@ -56,8 +56,8 @@ .rotmode = PART_ROT_VEL, \ .avemode = PART_AVE_VELOCITY, \ \ - .child_nbr = 10, \ - .ren_child_nbr = 100, \ + .child_percent = 10, \ + .child_render_percent = 100, \ .childrad = 0.2f, \ .childflat = 0.0f, \ .clumppow = 0.0f, \ diff --git a/source/blender/makesdna/DNA_particle_types.h b/source/blender/makesdna/DNA_particle_types.h index 397385c0f5b..f3d342e4849 100644 --- a/source/blender/makesdna/DNA_particle_types.h +++ b/source/blender/makesdna/DNA_particle_types.h @@ -226,7 +226,7 @@ typedef struct ParticleSettings { /* children */ int child_flag; char _pad3[4]; - int child_nbr, ren_child_nbr; + int child_percent, child_render_percent; float parents, childsize, childrandsize; float childrad, childflat; /* clumping */ diff --git a/source/blender/makesdna/intern/dna_rename_defs.h b/source/blender/makesdna/intern/dna_rename_defs.h index 7b155df3084..439d3fc7bcb 100644 --- a/source/blender/makesdna/intern/dna_rename_defs.h +++ b/source/blender/makesdna/intern/dna_rename_defs.h @@ -86,9 +86,11 @@ DNA_STRUCT_RENAME_ELEM(Object, dup_group, instance_collection) DNA_STRUCT_RENAME_ELEM(Object, dupfacesca, instance_faces_scale) DNA_STRUCT_RENAME_ELEM(Object, restrictflag, visibility_flag) DNA_STRUCT_RENAME_ELEM(Object, size, scale) +DNA_STRUCT_RENAME_ELEM(ParticleSettings, child_nbr, child_percent) 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(ParticleSettings, ren_child_nbr, child_render_percent) DNA_STRUCT_RENAME_ELEM(RigidBodyWorld, steps_per_second, substeps_per_frame) DNA_STRUCT_RENAME_ELEM(RenderData, bake_filter, bake_margin) DNA_STRUCT_RENAME_ELEM(SpaceSeq, overlay_type, overlay_frame_type) |