Revision: 21725
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=21725
Author: genscher
Date: 2009-07-20 19:15:41 +0200 (Mon, 20 Jul 2009)
Log Message:
-----------
Some little UI adjustments to cloth + fluid panel and their presets
Modified Paths:
--------------
branches/blender2.5/blender/release/ui/buttons_physics_cloth.py
branches/blender2.5/blender/release/ui/buttons_physics_fluid.py
branches/blender2.5/blender/source/blender/blenkernel/intern/fluidsim.c
branches/blender2.5/blender/source/blender/makesrna/intern/rna_cloth.c
branches/blender2.5/blender/source/blender/makesrna/intern/rna_fluidsim.c
Modified: branches/blender2.5/blender/release/ui/buttons_physics_cloth.py
===================================================================
--- branches/blender2.5/blender/release/ui/buttons_physics_cloth.py
2009-07-20 16:39:16 UTC (rev 21724)
+++ branches/blender2.5/blender/release/ui/buttons_physics_cloth.py
2009-07-20 17:15:41 UTC (rev 21725)
@@ -147,7 +147,7 @@
col = split.column(align=True)
col.itemR(cloth, "collision_quality", slider=True,
text="Quality")
- col.itemR(cloth, "min_distance", text="Distance")
+ col.itemR(cloth, "min_distance", slider=True, text="Distance")
col.itemR(cloth, "friction")
col = split.column(align=True)
@@ -155,7 +155,7 @@
col = col.column(align=True)
col.active = cloth.enable_self_collision
col.itemR(cloth, "self_collision_quality", slider=True,
text="Quality")
- col.itemR(cloth, "self_min_distance", text="Distance")
+ col.itemR(cloth, "self_min_distance", slider=True,
text="Distance")
class PHYSICS_PT_cloth_stiffness(PhysicButtonsPanel):
__idname__ = "PHYSICS_PT_stiffness"
Modified: branches/blender2.5/blender/release/ui/buttons_physics_fluid.py
===================================================================
--- branches/blender2.5/blender/release/ui/buttons_physics_fluid.py
2009-07-20 16:39:16 UTC (rev 21724)
+++ branches/blender2.5/blender/release/ui/buttons_physics_fluid.py
2009-07-20 17:15:41 UTC (rev 21725)
@@ -105,7 +105,7 @@
colsub=col.column(align=True)
colsub.itemR(fluid, "slip_type", text="")
if fluid.slip_type == 'PARTIALSLIP':
- colsub.itemR(fluid,
"partial_slip_amount", text="Amount")
+ colsub.itemR(fluid,
"partial_slip_amount", slider=True, text="Amount")
col.itemR(fluid, "impact_factor")
@@ -199,8 +199,8 @@
col.itemL(text="Gravity:")
col.itemR(fluid, "gravity", text="")
- col.itemL(text="Size:")
- col.itemR(fluid, "real_world_size", text="Real World Size")
+ col.itemL(text="Real World Size:")
+ col.itemR(fluid, "real_world_size", text="Metres")
col = split.column()
col.itemL(text="Viscosity Presets:")
@@ -217,7 +217,7 @@
col.itemL(text="Optimization:")
col=col.column(align=True)
col.itemR(fluid, "grid_levels", slider=True)
- col.itemR(fluid, "compressibility")
+ col.itemR(fluid, "compressibility", slider=True)
class PHYSICS_PT_domain_boundary(PhysicButtonsPanel):
__idname__ = "PHYSICS_PT_domain_boundary"
@@ -243,7 +243,7 @@
col=col.column(align=True)
col.itemR(fluid, "slip_type", text="")
if fluid.slip_type == 'PARTIALSLIP':
- col.itemR(fluid, "partial_slip_amount", text="Amount")
+ col.itemR(fluid, "partial_slip_amount", slider=True,
text="Amount")
col = split.column()
col.itemL(text="Surface:")
col=col.column(align=True)
Modified:
branches/blender2.5/blender/source/blender/blenkernel/intern/fluidsim.c
===================================================================
--- branches/blender2.5/blender/source/blender/blenkernel/intern/fluidsim.c
2009-07-20 16:39:16 UTC (rev 21724)
+++ branches/blender2.5/blender/source/blender/blenkernel/intern/fluidsim.c
2009-07-20 17:15:41 UTC (rev 21725)
@@ -117,7 +117,7 @@
fss->typeFlags = OB_FSBND_PARTSLIP;
fss->domainNovecgen = 0;
fss->volumeInitType = 1; // volume
- fss->partSlipValue = 0.5;
+ fss->partSlipValue = 0.2;
fss->generateTracers = 0;
fss->generateParticles = 0.0;
Modified: branches/blender2.5/blender/source/blender/makesrna/intern/rna_cloth.c
===================================================================
--- branches/blender2.5/blender/source/blender/makesrna/intern/rna_cloth.c
2009-07-20 16:39:16 UTC (rev 21724)
+++ branches/blender2.5/blender/source/blender/makesrna/intern/rna_cloth.c
2009-07-20 17:15:41 UTC (rev 21725)
@@ -247,7 +247,7 @@
prop= RNA_def_property(srna, "quality", PROP_INT, PROP_NONE);
RNA_def_property_int_sdna(prop, NULL, "stepsPerFrame");
RNA_def_property_range(prop, 4, 80);
- RNA_def_property_ui_text(prop, "Quality", "Quality of the simulation in
steps per frame (higher is better quality but slower).");
+ RNA_def_property_ui_text(prop, "Quality", "Quality of the simulation in
steps per frame. (higher is better quality but slower)");
RNA_def_property_update(prop, NC_OBJECT|ND_GEOM_DATA,
"rna_cloth_update");
/* springs */
@@ -260,7 +260,7 @@
prop= RNA_def_property(srna, "spring_damping", PROP_FLOAT, PROP_NONE);
RNA_def_property_float_sdna(prop, NULL, "Cdis");
RNA_def_property_range(prop, 0.0f, 50.0f);
- RNA_def_property_ui_text(prop, "Spring Damping", "Damping of cloth
velocity (higher = more smooth, less jiggling)");
+ RNA_def_property_ui_text(prop, "Spring Damping", "Damping of cloth
velocity. (higher = more smooth, less jiggling)");
RNA_def_property_update(prop, NC_OBJECT|ND_GEOM_DATA,
"rna_cloth_update");
prop= RNA_def_property(srna, "structural_stiffness", PROP_FLOAT,
PROP_NONE);
@@ -284,7 +284,7 @@
prop= RNA_def_property(srna, "bending_stiffness", PROP_FLOAT,
PROP_NONE);
RNA_def_property_float_sdna(prop, NULL, "bending");
RNA_def_property_range(prop, 0.0f, 10000.0f);
- RNA_def_property_ui_text(prop, "Bending Stiffness", "Wrinkle
coefficient (higher = less smaller but more big wrinkles).");
+ RNA_def_property_ui_text(prop, "Bending Stiffness", "Wrinkle
coefficient. (higher = less smaller but more big wrinkles)");
RNA_def_property_update(prop, NC_OBJECT|ND_GEOM_DATA,
"rna_cloth_update");
prop= RNA_def_property(srna, "bending_stiffness_max", PROP_FLOAT,
PROP_NONE);
@@ -363,18 +363,18 @@
prop= RNA_def_property(srna, "min_distance", PROP_FLOAT, PROP_NONE);
RNA_def_property_float_sdna(prop, NULL, "epsilon");
RNA_def_property_range(prop, 0.001f, 1.0f);
- RNA_def_property_ui_text(prop, "Minimum Distance", "Minimum distance
between collision objects before collision response takes in");
+ RNA_def_property_ui_text(prop, "Minimum Distance", "Minimum distance
between collision objects before collision response takes in.");
RNA_def_property_update(prop, NC_OBJECT|ND_GEOM_DATA,
"rna_cloth_update");
prop= RNA_def_property(srna, "friction", PROP_FLOAT, PROP_NONE);
RNA_def_property_range(prop, 0.0f, 80.0f);
- RNA_def_property_ui_text(prop, "Friction", "Friction force if a
collision happened (higher = less movement).");
+ RNA_def_property_ui_text(prop, "Friction", "Friction force if a
collision happened. (higher = less movement)");
RNA_def_property_update(prop, NC_OBJECT|ND_GEOM_DATA,
"rna_cloth_update");
prop= RNA_def_property(srna, "collision_quality", PROP_INT, PROP_NONE);
RNA_def_property_int_sdna(prop, NULL, "loop_count");
RNA_def_property_range(prop, 1, 20);
- RNA_def_property_ui_text(prop, "Collision Quality", "How many collision
iterations should be done (higher is better quality but slower).");
+ RNA_def_property_ui_text(prop, "Collision Quality", "How many collision
iterations should be done. (higher is better quality but slower)");
RNA_def_property_update(prop, NC_OBJECT|ND_GEOM_DATA,
"rna_cloth_update");
/* self collision */
@@ -387,7 +387,7 @@
prop= RNA_def_property(srna, "self_min_distance", PROP_FLOAT,
PROP_NONE);
RNA_def_property_float_sdna(prop, NULL, "selfepsilon");
RNA_def_property_range(prop, 0.5f, 1.0f);
- RNA_def_property_ui_text(prop, "Self Minimum Distance", "0.5 means no
distance at all, 1.0 is maximum distance");
+ RNA_def_property_ui_text(prop, "Self Minimum Distance", "0.5 means no
distance at all, 1.0 is maximum distance.");
RNA_def_property_update(prop, NC_OBJECT|ND_GEOM_DATA,
"rna_cloth_update");
prop= RNA_def_property(srna, "self_friction", PROP_FLOAT, PROP_NONE);
@@ -398,7 +398,7 @@
prop= RNA_def_property(srna, "self_collision_quality", PROP_INT,
PROP_NONE);
RNA_def_property_int_sdna(prop, NULL, "self_loop_count");
RNA_def_property_range(prop, 1, 10);
- RNA_def_property_ui_text(prop, "Self Collision Quality", "How many self
collision iterations should be done. (higher is better quality but slower), can
be changed for each frame.");
+ RNA_def_property_ui_text(prop, "Self Collision Quality", "How many self
collision iterations should be done. (higher is better quality but slower)");
RNA_def_property_update(prop, NC_OBJECT|ND_GEOM_DATA,
"rna_cloth_update");
}
Modified:
branches/blender2.5/blender/source/blender/makesrna/intern/rna_fluidsim.c
===================================================================
--- branches/blender2.5/blender/source/blender/makesrna/intern/rna_fluidsim.c
2009-07-20 16:39:16 UTC (rev 21724)
+++ branches/blender2.5/blender/source/blender/makesrna/intern/rna_fluidsim.c
2009-07-20 17:15:41 UTC (rev 21725)
@@ -274,7 +274,7 @@
prop= RNA_def_property(srna, "compressibility", PROP_FLOAT, PROP_NONE);
RNA_def_property_float_sdna(prop, NULL, "gstar");
RNA_def_property_range(prop, 0.001, 0.1);
- RNA_def_property_ui_text(prop, "Compressibility", "Allowed
compressibility due to gravitational force for standing fluid (directly affects
simulation step size).");
+ RNA_def_property_ui_text(prop, "Compressibility", "Allowed
compressibility due to gravitational force for standing fluid. (directly
affects simulation step size)");
/* domain boundary settings */
@@ -382,7 +382,7 @@
prop= RNA_def_property(srna, "local_coordinates", PROP_BOOLEAN,
PROP_NONE);
RNA_def_property_boolean_sdna(prop, NULL, "typeFlags",
OB_FSINFLOW_LOCALCOORD);
- RNA_def_property_ui_text(prop, "Local Coordinates", "Use local
coordinates for inflow (e.g. for rotating objects).");
+ RNA_def_property_ui_text(prop, "Local Coordinates", "Use local
coordinates for inflow. (e.g. for rotating objects)");
}
static void rna_def_fluidsim_outflow(BlenderRNA *brna)
@@ -425,7 +425,7 @@
prop= RNA_def_property(srna, "alpha_influence", PROP_FLOAT, PROP_NONE);
RNA_def_property_float_sdna(prop, NULL, "particleInfAlpha");
RNA_def_property_range(prop, 0.0, 2.0);
- RNA_def_property_ui_text(prop, "Alpha Influence", "Amount of particle
alpha change, inverse of size influence: 0=off (all same alpha), 1=full (large
particles get lower alphas, smaller ones higher values).");
+ RNA_def_property_ui_text(prop, "Alpha Influence", "Amount of particle
alpha change, inverse of size influence: 0=off (all same alpha), 1=full. (large
particles get lower alphas, smaller ones higher values)");
prop= RNA_def_property(srna, "path", PROP_STRING, PROP_DIRPATH);
RNA_def_property_string_maxlength(prop, 240);
@@ -476,7 +476,7 @@
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
