[Bf-blender-cvs] [d98d4fce93f] master: Fix T62631: Cloth vertex mass capped to a very low number on scaled scenes.

Sebastian Parborg noreply at git.blender.org
Thu Nov 21 12:30:52 CET 2019


Commit: d98d4fce93f4b7ae2f4c48d70a3e5f4b324ac1ba
Author: Sebastian Parborg
Date:   Thu Nov 21 12:28:39 2019 +0100
Branches: master
https://developer.blender.org/rBd98d4fce93f4b7ae2f4c48d70a3e5f4b324ac1ba

Fix T62631: Cloth vertex mass capped to a very low number on scaled scenes.

Removed the weight limit and made the setting more clear in what it actually does.
IE, it controlls the weight of the vertices of the cloth mesh

Reviewed By: Brecht

Differential Revision: http://developer.blender.org/D5450

===================================================================

M	release/scripts/startup/bl_ui/properties_physics_cloth.py
M	source/blender/makesrna/intern/rna_cloth.c

===================================================================

diff --git a/release/scripts/startup/bl_ui/properties_physics_cloth.py b/release/scripts/startup/bl_ui/properties_physics_cloth.py
index 40f7cfca263..3e87c9cd0c0 100644
--- a/release/scripts/startup/bl_ui/properties_physics_cloth.py
+++ b/release/scripts/startup/bl_ui/properties_physics_cloth.py
@@ -92,7 +92,7 @@ class PHYSICS_PT_cloth_physical_properties(PhysicButtonsPanel, Panel):
         flow = layout.grid_flow(row_major=False, columns=0, even_columns=True, even_rows=False, align=True)
 
         col = flow.column()
-        col.prop(cloth, "mass", text="Mass")
+        col.prop(cloth, "mass", text="Vertex Mass")
         col = flow.column()
         col.prop(cloth, "air_damping", text="Air Viscosity")
         col = flow.column()
diff --git a/source/blender/makesrna/intern/rna_cloth.c b/source/blender/makesrna/intern/rna_cloth.c
index 036aeebda52..e1a06a76235 100644
--- a/source/blender/makesrna/intern/rna_cloth.c
+++ b/source/blender/makesrna/intern/rna_cloth.c
@@ -533,8 +533,8 @@ static void rna_def_cloth_sim_settings(BlenderRNA *brna)
   /* mass */
 
   prop = RNA_def_property(srna, "mass", PROP_FLOAT, PROP_UNIT_MASS);
-  RNA_def_property_range(prop, 0.0f, 10.0f);
-  RNA_def_property_ui_text(prop, "Mass", "Mass of cloth material");
+  RNA_def_property_range(prop, 0.0f, FLT_MAX);
+  RNA_def_property_ui_text(prop, "Vertex Mass", "The mass of each vertex on the cloth material");
   RNA_def_property_update(prop, 0, "rna_cloth_update");
 
   prop = RNA_def_property(srna, "vertex_group_mass", PROP_STRING, PROP_NONE);



More information about the Bf-blender-cvs mailing list