diff options
Diffstat (limited to 'source/blender/blenkernel/intern/particle_system.c')
| -rw-r--r-- | source/blender/blenkernel/intern/particle_system.c | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/source/blender/blenkernel/intern/particle_system.c b/source/blender/blenkernel/intern/particle_system.c index 39226faff1e..6d8d6c233ac 100644 --- a/source/blender/blenkernel/intern/particle_system.c +++ b/source/blender/blenkernel/intern/particle_system.c @@ -58,7 +58,6 @@ #include "BLI_threads.h" #include "BKE_anim.h" -#include "BKE_bad_level_calls.h" #include "BKE_cdderivedmesh.h" #include "BKE_collision.h" #include "BKE_displist.h" @@ -80,10 +79,6 @@ #include "PIL_time.h" -#include "BSE_headerbuttons.h" - -#include "blendef.h" - #include "RE_shader_ext.h" /* fluid sim particle import */ @@ -965,7 +960,7 @@ int psys_threads_init_distribution(ParticleThread *threads, DerivedMesh *finaldm return 0; if (!finaldm->deformedOnly && !CustomData_has_layer( &finaldm->faceData, CD_ORIGINDEX ) ) { - error("Can't paint with the current modifier stack, disable destructive modifiers"); +// XXX error("Can't paint with the current modifier stack, disable destructive modifiers"); return 0; } @@ -1555,9 +1550,9 @@ void initialize_particle(ParticleData *pa, int p, Object *ob, ParticleSystem *ps pa->lifetime= part->lifetime*ptex.life; if(part->type==PART_HAIR) - pa->time=0.0f; + pa->time= 0.0f; else if(part->type==PART_REACTOR && (part->flag&PART_REACT_STA_END)==0) - pa->time=MAXFRAMEF; + pa->time= 300000.0f; /* max frame */ else{ //icu=find_ipocurve(psys->part->ipo,PART_EMIT_TIME); //if(icu){ @@ -4191,7 +4186,7 @@ static void hair_step(Object *ob, ParticleSystemModifierData *psmd, ParticleSyst precalc_effectors(ob,psys,psmd,cfra); if(psys_in_edit_mode(psys)) - PE_recalc_world_cos(ob, psys); + ; //XXX PE_recalc_world_cos(ob, psys); psys_update_path_cache(ob,psmd,psys,cfra); } @@ -4690,7 +4685,7 @@ void particle_system_update(Object *ob, ParticleSystem *psys) if(!psys_check_enabled(ob, psys)) return; - cfra= bsystem_time(ob, CFRA, 0.0f); + cfra= bsystem_time(ob, (float)G.scene->r.cfra, 0.0f); psmd= psys_get_modifier(ob, psys); /* system was already updated from modifier stack */ |