[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [54715] trunk/blender/source/blender: Code cleanup:
Thomas Dinges
blender at dingto.org
Thu Feb 21 18:46:26 CET 2013
Revision: 54715
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=54715
Author: dingto
Date: 2013-02-21 17:46:26 +0000 (Thu, 21 Feb 2013)
Log Message:
-----------
Code cleanup:
* Removed "rotfrom" from particle RNA/DNA, was not used anywhere.
Modified Paths:
--------------
trunk/blender/source/blender/makesdna/DNA_particle_types.h
trunk/blender/source/blender/makesrna/intern/rna_particle.c
Modified: trunk/blender/source/blender/makesdna/DNA_particle_types.h
===================================================================
--- trunk/blender/source/blender/makesdna/DNA_particle_types.h 2013-02-21 17:39:48 UTC (rev 54714)
+++ trunk/blender/source/blender/makesdna/DNA_particle_types.h 2013-02-21 17:46:26 UTC (rev 54715)
@@ -173,7 +173,8 @@
/* 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 @@
#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
Modified: trunk/blender/source/blender/makesrna/intern/rna_particle.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_particle.c 2013-02-21 17:39:48 UTC (rev 54714)
+++ trunk/blender/source/blender/makesrna/intern/rna_particle.c 2013-02-21 17:46:26 UTC (rev 54715)
@@ -1937,14 +1937,6 @@
};
/*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 @@
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",
More information about the Bf-blender-cvs
mailing list