[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [14354] trunk/blender/source/blender: bug fix
Jens Ole Wund (bjornmose)
bjornmose at gmx.net
Mon Apr 7 23:58:19 CEST 2008
Revision: 14354
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=14354
Author: bjornmose
Date: 2008-04-07 23:58:12 +0200 (Mon, 07 Apr 2008)
Log Message:
-----------
bug fix
UI panel issues with soft bodies
code cleaning .. remove some G.rt code
Modified Paths:
--------------
trunk/blender/source/blender/blenkernel/intern/softbody.c
trunk/blender/source/blender/src/buttons_object.c
Modified: trunk/blender/source/blender/blenkernel/intern/softbody.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/softbody.c 2008-04-07 20:56:45 UTC (rev 14353)
+++ trunk/blender/source/blender/blenkernel/intern/softbody.c 2008-04-07 21:58:12 UTC (rev 14354)
@@ -2747,10 +2747,6 @@
}
/* 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;
Modified: trunk/blender/source/blender/src/buttons_object.c
===================================================================
--- trunk/blender/source/blender/src/buttons_object.c 2008-04-07 20:56:45 UTC (rev 14353)
+++ trunk/blender/source/blender/src/buttons_object.c 2008-04-07 21:58:12 UTC (rev 14354)
@@ -2323,7 +2323,7 @@
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 @@
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 @@
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 @@
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 @@
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);
More information about the Bf-blender-cvs
mailing list