diff options
author | Jens Ole Wund <bjornmose@gmx.net> | 2008-04-08 01:58:12 +0400 |
---|---|---|
committer | Jens Ole Wund <bjornmose@gmx.net> | 2008-04-08 01:58:12 +0400 |
commit | aed7f950d04603c2c741dfab2cbc3363a10ed55f (patch) | |
tree | 0853f88ca4deb53b0a7173186dfcaa11116d399e /source/blender | |
parent | 79ed118fd492d13e261fcef7c68bf875761f4a6d (diff) |
bug fix
UI panel issues with soft bodies
code cleaning .. remove some G.rt code
Diffstat (limited to 'source/blender')
-rw-r--r-- | source/blender/blenkernel/intern/softbody.c | 4 | ||||
-rw-r--r-- | source/blender/src/buttons_object.c | 8 |
2 files changed, 5 insertions, 7 deletions
diff --git a/source/blender/blenkernel/intern/softbody.c b/source/blender/blenkernel/intern/softbody.c index aa570085851..df6b0d37867 100644 --- a/source/blender/blenkernel/intern/softbody.c +++ b/source/blender/blenkernel/intern/softbody.c @@ -2747,10 +2747,6 @@ static void springs_from_mesh(Object *ob) } /* recalculate spring length for meshes here */ - /* special hidden feature! shrink to fit */ - if (G.rt > 500){ - scale = (G.rt - 500) / 100.0f; - } /* public version shrink to fit */ if (sb->springpreload != 0 ){ scale = sb->springpreload / 100.0f; diff --git a/source/blender/src/buttons_object.c b/source/blender/src/buttons_object.c index af0c06bc3d4..d867cec1c89 100644 --- a/source/blender/src/buttons_object.c +++ b/source/blender/src/buttons_object.c @@ -2323,7 +2323,7 @@ void do_object_panels(unsigned short event) BLI_addtail(&ob->particlesystem,psys); md= modifier_new(eModifierType_ParticleSystem); - sprintf(md->name, "FluidParticleSystem"); + sprintf(md->name, "FluidParticleSystem", BLI_countlist(&ob->particlesystem)); psmd= (ParticleSystemModifierData*) md; psmd->psys=psys; BLI_addtail(&ob->modifiers, md); @@ -3633,7 +3633,7 @@ static void object_softbodies_collision(Object *ob) ob->pd->pdef_sboft = 0.02f; } block= uiNewBlock(&curarea->uiblocks, "object_softbodies_collision", UI_EMBOSS, UI_HELV, curarea->win); - // uiNewPanelTabbed("Soft Body", "Physics"); /*don't really want it tabbed first */ + uiNewPanelTabbed("Soft Body", "Physics"); if(uiNewPanel(curarea, block, "Soft Body Collision", "Physics", 651, 0, 318, 204)==0) return; uiSetButLock(object_data_is_libdata(ob), ERROR_LIBDATA_MESSAGE); @@ -3733,6 +3733,7 @@ static void object_softbodies_solver(Object *ob) int ob_has_hair=psys_ob_has_hair(ob); if(!_can_softbodies_at_all(ob)) return; block= uiNewBlock(&curarea->uiblocks, "object_softbodies_solver", UI_EMBOSS, UI_HELV, curarea->win); + uiNewPanelTabbed("Soft Body", "Physics"); if(uiNewPanel(curarea, block, "Soft Body Solver", "Physics", 651, 0, 318, 204)==0) return; uiSetButLock(object_data_is_libdata(ob), ERROR_LIBDATA_MESSAGE); @@ -3825,7 +3826,7 @@ static void sb_clear_cache(void *ob_v, void *actsoft_v) Object *ob = ob_v; short *actsoft = actsoft_v; - if(actsoft) + if(actsoft >= 0) clear_particles_from_cache(ob, BLI_findlink(&ob->particlesystem, *actsoft), CFRA); else softbody_clear_cache(ob, CFRA); @@ -3843,6 +3844,7 @@ static void object_softbodies(Object *ob) if(!_can_softbodies_at_all(ob)) return; block= uiNewBlock(&curarea->uiblocks, "object_softbodies", UI_EMBOSS, UI_HELV, curarea->win); + uiNewPanelTabbed("Soft Body", "Physics"); if(uiNewPanel(curarea, block, "Soft Body", "Physics", 640, 0, 318, 204)==0) return; uiSetButLock(object_data_is_libdata(ob), ERROR_LIBDATA_MESSAGE); |