diff options
| author | Thomas Dinges <blender@dingto.org> | 2013-02-21 21:46:26 +0400 |
|---|---|---|
| committer | Thomas Dinges <blender@dingto.org> | 2013-02-21 21:46:26 +0400 |
| commit | b25ba60afe6484bc454555bcccaf06b8256d324d (patch) | |
| tree | 468dbcbb70fcdaf6179fb614698e22e9bf779f93 | |
| parent | a31a93ca3f479739fe07173b65dc042ca4b7aa64 (diff) | |
Code cleanup:
* Removed "rotfrom" from particle RNA/DNA, was not used anywhere.
| -rw-r--r-- | source/blender/makesdna/DNA_particle_types.h | 8 | ||||
| -rw-r--r-- | source/blender/makesrna/intern/rna_particle.c | 17 |
2 files changed, 2 insertions, 23 deletions
diff --git a/source/blender/makesdna/DNA_particle_types.h b/source/blender/makesdna/DNA_particle_types.h index 1cf16fb52b3..ec2a724ac82 100644 --- a/source/blender/makesdna/DNA_particle_types.h +++ b/source/blender/makesdna/DNA_particle_types.h @@ -173,7 +173,8 @@ typedef struct ParticleSettings { /* adaptive path rendering */ short adapt_angle, adapt_pix; - short disp, omat, interpolation, rotfrom, integrator; + short disp, omat, interpolation, integrator; + short rotfrom DNA_DEPRECATED; short kink, kink_axis; /* billboards */ @@ -359,11 +360,6 @@ typedef struct ParticleSystem { #define PART_SELF_EFFECT (1<<22) -/* part->rotfrom */ -#define PART_ROT_KEYS 0 /* interpolate directly from keys */ -#define PART_ROT_ZINCR 1 /* same as zdir but done incrementally from previous position */ -#define PART_ROT_IINCR 2 /* same as idir but done incrementally from previous position */ - /* part->from */ #define PART_FROM_VERT 0 #define PART_FROM_FACE 1 diff --git a/source/blender/makesrna/intern/rna_particle.c b/source/blender/makesrna/intern/rna_particle.c index dbf80f01335..f90389146aa 100644 --- a/source/blender/makesrna/intern/rna_particle.c +++ b/source/blender/makesrna/intern/rna_particle.c @@ -1937,14 +1937,6 @@ static void rna_def_particle_settings(BlenderRNA *brna) }; /*TODO: names, tooltips */ -#if 0 - static EnumPropertyItem rot_from_items[] = { - {PART_ROT_KEYS, "KEYS", 0, "keys", ""}, - {PART_ROT_ZINCR, "ZINCR", 0, "zincr", ""}, - {PART_ROT_IINCR, "IINCR", 0, "iincr", ""}, - {0, NULL, 0, NULL, NULL} - }; -#endif static EnumPropertyItem integrator_type_items[] = { {PART_INT_EULER, "EULER", 0, "Euler", ""}, {PART_INT_VERLET, "VERLET", 0, "Verlet", ""}, @@ -2346,15 +2338,6 @@ static void rna_def_particle_settings(BlenderRNA *brna) RNA_def_property_ui_text(prop, "Material", "Material used for the particles"); RNA_def_property_update(prop, 0, "rna_Particle_redo"); - - /* not used anywhere, why is this in DNA??? */ -#if 0 - prop = RNA_def_property(srna, "rotate_from", PROP_ENUM, PROP_NONE); - RNA_def_property_enum_sdna(prop, NULL, "rotfrom"); - RNA_def_property_enum_items(prop, rot_from_items); - RNA_def_property_ui_text(prop, "Rotate From", ""); -#endif - prop = RNA_def_property(srna, "integrator", PROP_ENUM, PROP_NONE); RNA_def_property_enum_items(prop, integrator_type_items); RNA_def_property_ui_text(prop, "Integration", |