diff options
| -rw-r--r-- | release/ui/buttons_game.py | 36 | ||||
| -rw-r--r-- | source/blender/makesrna/intern/rna_object.c | 10 | ||||
| -rw-r--r-- | source/blender/makesrna/intern/rna_object_force.c | 8 |
3 files changed, 27 insertions, 27 deletions
diff --git a/release/ui/buttons_game.py b/release/ui/buttons_game.py index fbf1ff82534..b662254f1bb 100644 --- a/release/ui/buttons_game.py +++ b/release/ui/buttons_game.py @@ -35,8 +35,8 @@ class PHYSICS_PT_game_physics(PhysicsButtonsPanel): col.itemR(ob, "restrict_render", text="Invisible") # out of place but useful col = split.column() - col.itemR(game, "do_fh", text="Use Material Physics") - col.itemR(game, "rotation_fh", text="Rotate From Normal") + col.itemR(game, "material_physics") + col.itemR(game, "rotate_from_normal") col.itemR(game, "no_sleeping") layout.itemS() @@ -50,12 +50,15 @@ class PHYSICS_PT_game_physics(PhysicsButtonsPanel): sub.itemR(game, "radius") sub.itemR(game, "form_factor") - col.itemS() + col = split.column() + sub = col.column() + sub.active = (game.physics_type == 'RIGID_BODY') + sub.itemR(game, "anisotropic_friction") + subsub = sub.column() + subsub.active = game.anisotropic_friction + subsub.itemR(game, "friction_coefficients", text="", slider=True) - col.itemL(text="Damping:") - sub = col.column(align=True) - sub.itemR(game, "damping", text="Translation", slider=True) - sub.itemR(game, "rotation_damping", text="Rotation", slider=True) + split = layout.split() col = split.column() col.itemL(text="Velocity:") @@ -63,14 +66,11 @@ class PHYSICS_PT_game_physics(PhysicsButtonsPanel): sub.itemR(game, "minimum_velocity", text="Minimum") sub.itemR(game, "maximum_velocity", text="Maximum") - col.itemS() - - sub = col.column() - sub.active = (game.physics_type == 'RIGID_BODY') - sub.itemR(game, "anisotropic_friction") - subsub = sub.column() - subsub.active = game.anisotropic_friction - subsub.itemR(game, "friction_coefficients", text="", slider=True) + col = split.column() + col.itemL(text="Damping:") + sub = col.column(align=True) + sub.itemR(game, "damping", text="Translation", slider=True) + sub.itemR(game, "rotation_damping", text="Rotation", slider=True) layout.itemS() @@ -119,10 +119,10 @@ class PHYSICS_PT_game_physics(PhysicsButtonsPanel): col.itemS() col.itemL(text="Cluster Collision:") - col.itemR(soft, "enable_rs_collision", text="Rigid to Soft Body") - col.itemR(soft, "enable_ss_collision", text="Soft to Soft Body") + col.itemR(soft, "cluster_rigid_to_softbody") + col.itemR(soft, "cluster_soft_to_softbody") sub = col.column() - sub.active = (soft.enable_rs_collision or soft.enable_ss_collision) + sub.active = (soft.cluster_rigid_to_softbody or soft.cluster_soft_to_softbody) sub.itemR(soft, "cluster_iterations", text="Iterations") elif game.physics_type == 'STATIC': diff --git a/source/blender/makesrna/intern/rna_object.c b/source/blender/makesrna/intern/rna_object.c index 2e40765935d..bad36025eda 100644 --- a/source/blender/makesrna/intern/rna_object.c +++ b/source/blender/makesrna/intern/rna_object.c @@ -839,7 +839,7 @@ static void rna_def_object_game_settings(BlenderRNA *brna) prop= RNA_def_property(srna, "radius", PROP_FLOAT, PROP_NONE|PROP_UNIT_LENGTH); RNA_def_property_float_sdna(prop, NULL, "inertia"); RNA_def_property_range(prop, 0.01, 10.0); - RNA_def_property_ui_text(prop, "Radius", "Radius for Bounding sphere and Fh/Fh Rot."); + RNA_def_property_ui_text(prop, "Radius", "Radius of bounding sphere and material physics"); RNA_def_property_update(prop, NC_OBJECT|ND_DRAW, NULL); prop= RNA_def_property(srna, "no_sleeping", PROP_BOOLEAN, PROP_NONE); @@ -899,13 +899,13 @@ static void rna_def_object_game_settings(BlenderRNA *brna) RNA_def_property_ui_text(prop, "Lock Z Rotation Axis", "Disable simulation of angular motion along the Z axis."); - prop= RNA_def_property(srna, "do_fh", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "material_physics", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "gameflag", OB_DO_FH); - RNA_def_property_ui_text(prop, "Do Fh", "Use Fh settings in materials."); + RNA_def_property_ui_text(prop, "Use Material Physics", "Use physics settings in materials."); - prop= RNA_def_property(srna, "rotation_fh", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "rotate_from_normal", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "gameflag", OB_ROT_FH); - RNA_def_property_ui_text(prop, "Rotation Fh", "Use face normal to rotate Object"); + RNA_def_property_ui_text(prop, "Rotate From Normal", "Use face normal to rotate object, so that it points away from the surface"); prop= RNA_def_property(srna, "form_factor", PROP_FLOAT, PROP_NONE); RNA_def_property_float_sdna(prop, NULL, "formfactor"); diff --git a/source/blender/makesrna/intern/rna_object_force.c b/source/blender/makesrna/intern/rna_object_force.c index 93274a01cc5..932bef9969d 100644 --- a/source/blender/makesrna/intern/rna_object_force.c +++ b/source/blender/makesrna/intern/rna_object_force.c @@ -864,13 +864,13 @@ static void rna_def_game_softbody(BlenderRNA *brna) RNA_def_property_boolean_sdna(prop, NULL, "flag", OB_BSB_BENDING_CONSTRAINTS); RNA_def_property_ui_text(prop, "Bending Const", "Enable bending constraints"); - prop= RNA_def_property(srna, "enable_rs_collision", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "cluster_rigid_to_softbody", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "collisionflags", OB_BSB_COL_CL_RS); - RNA_def_property_ui_text(prop, "Cluster Collision RS", "Enable cluster collision between soft and rigid body"); + RNA_def_property_ui_text(prop, "Rigid to Soft Body", "Enable cluster collision between soft and rigid body"); - prop= RNA_def_property(srna, "enable_ss_collision", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "cluster_soft_to_softbody", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "collisionflags", OB_BSB_COL_CL_SS); - RNA_def_property_ui_text(prop, "Cluster Collision SS", "Enable cluster collision between soft and soft body"); + RNA_def_property_ui_text(prop, "Soft to Soft Body", "Enable cluster collision between soft and soft body"); } static void rna_def_softbody(BlenderRNA *brna) |