From fc066a6a5d01718981c9dcae23c5f4f47f3d7b1e Mon Sep 17 00:00:00 2001 From: Janne Karhu Date: Fri, 25 Dec 2009 23:51:29 +0000 Subject: Fix for [#20458] Segmentation fault when trying to enable Hair dynamics * The hair mesh vertex index was stored as a short, but vertex counts can easily go higher than what fits in a short so changed this to an int. * Also removed particle life looping, which didn't work correctly anyways. Similar functionality will become available when I get to recoding reactor particles into a better system. --- source/blender/makesrna/intern/rna_particle.c | 11 ----------- 1 file changed, 11 deletions(-) (limited to 'source/blender/makesrna/intern/rna_particle.c') diff --git a/source/blender/makesrna/intern/rna_particle.c b/source/blender/makesrna/intern/rna_particle.c index c5b1aafb1a3..543965a337e 100644 --- a/source/blender/makesrna/intern/rna_particle.c +++ b/source/blender/makesrna/intern/rna_particle.c @@ -814,11 +814,6 @@ static void rna_def_particle(BlenderRNA *brna) RNA_def_property_enum_items(prop, alive_items); RNA_def_property_ui_text(prop, "Alive State", ""); - prop= RNA_def_property(srna, "loop", PROP_INT, PROP_NONE); - RNA_def_property_clear_flag(prop, PROP_EDITABLE); - //TODO: bounds - RNA_def_property_ui_text(prop, "Loop", "How may times the particle life has looped"); - // short rt2; } @@ -978,12 +973,6 @@ static void rna_def_particle_settings(BlenderRNA *brna) RNA_def_property_ui_text(prop, "Multi React", "React multiple times."); RNA_def_property_update(prop, 0, "rna_Particle_reset"); - prop= RNA_def_property(srna, "loop", PROP_BOOLEAN, PROP_NONE); - RNA_def_property_boolean_sdna(prop, NULL, "flag", PART_LOOP); - RNA_def_property_clear_flag(prop, PROP_ANIMATEABLE); - RNA_def_property_ui_text(prop, "Loop", "Loop particle lives."); - RNA_def_property_update(prop, 0, "rna_Particle_reset"); - /* TODO: used somewhere? */ prop= RNA_def_property(srna, "hair_geometry", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "flag", PART_HAIR_GEOMETRY); -- cgit v1.2.3