diff options
Diffstat (limited to 'source/blender/editors/space_view3d/drawobject.c')
| -rw-r--r-- | source/blender/editors/space_view3d/drawobject.c | 21 |
1 files changed, 7 insertions, 14 deletions
diff --git a/source/blender/editors/space_view3d/drawobject.c b/source/blender/editors/space_view3d/drawobject.c index be98e24ea9d..532b4ce0771 100644 --- a/source/blender/editors/space_view3d/drawobject.c +++ b/source/blender/editors/space_view3d/drawobject.c @@ -3475,11 +3475,12 @@ static void draw_new_particle_system(Scene *scene, View3D *v3d, RegionView3D *rv select=1; } - psys_update_children(&sim); - psys->flag|=PSYS_DRAWING; - totchild=psys->totchild*part->disp/100; + if(part->type==PART_HAIR && !psys->childcache) + totchild=0; + else + totchild=psys->totchild*part->disp/100; ma= give_current_material(ob,part->omat); @@ -3516,16 +3517,8 @@ static void draw_new_particle_system(Scene *scene, View3D *v3d, RegionView3D *rv cfra=bsystem_time(scene, 0, (float)CFRA, 0.0f); - if(draw_as==PART_DRAW_PATH) { - if(psys->pathcache==NULL && psys->childcache==NULL) - psys_update_path_cache(&sim, cfra); - - /* can't create pathcache for some reason*/ - if(psys->pathcache==NULL && psys->childcache==NULL) - draw_as=PART_DRAW_DOT; - else if(psys->childcache==NULL) - totchild = 0; - } + if(draw_as==PART_DRAW_PATH && psys->pathcache==NULL && psys->childcache==NULL) + draw_as=PART_DRAW_DOT; /* 3. */ switch(draw_as){ @@ -3877,7 +3870,7 @@ static void draw_new_particle_system(Scene *scene, View3D *v3d, RegionView3D *rv UI_ThemeColor(TH_WIRE); }*/ - if(totchild && ((part->draw&PART_DRAW_PARENT)==0 || psys_in_edit_mode(scene, psys))) + if(totchild && (part->draw&PART_DRAW_PARENT)==0) totpart=0; else if(psys->pathcache==NULL) totpart=0; |