Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'release/ui/buttons_physics_field.py')
-rw-r--r--release/ui/buttons_physics_field.py115
1 files changed, 54 insertions, 61 deletions
diff --git a/release/ui/buttons_physics_field.py b/release/ui/buttons_physics_field.py
index b9c81042a13..3b054f7d557 100644
--- a/release/ui/buttons_physics_field.py
+++ b/release/ui/buttons_physics_field.py
@@ -22,62 +22,56 @@ class PHYSICS_PT_field(PhysicButtonsPanel):
#layout.active = field.enabled
- split = layout.split(percentage=0.3)
+ split = layout.split(percentage=0.2)
split.itemL(text="Type:")
- split.itemR(field, "type", text="")
-
+ split.itemR(field, "type",text="")
+
split = layout.split()
- col = split.column()
-
- if field.type == "GUIDE":
- col.itemR(field, "guide_path_add")
+ if field.type == 'GUIDE':
+ layout.itemR(field, "guide_path_add")
- elif field.type == "WIND":
- col.itemR(field, "strength")
+ elif field.type == 'WIND':
+ split.itemR(field, "strength")
col = split.column()
col.itemR(field, "noise")
col.itemR(field, "seed")
- elif field.type == "VORTEX":
- col.itemR(field, "strength")
+ elif field.type == 'VORTEX':
+ split.itemR(field, "strength")
+ split.itemL()
- col = split.column()
- col.itemL(text="")
-
- elif field.type in ("SPHERICAL", "CHARGE", "LENNARDJ"):
- col.itemR(field, "strength")
+ elif field.type in ('SPHERICAL', 'CHARGE', 'LENNARDJ'):
+ split.itemR(field, "strength")
col = split.column()
col.itemR(field, "planar")
col.itemR(field, "surface")
- elif field.type == "BOID":
- col.itemR(field, "strength")
+ elif field.type == 'BOID':
+ split.itemR(field, "strength")
+ split.itemR(field, "surface")
- col = split.column()
- col.itemR(field, "surface")
-
- elif field.type == "MAGNET":
- col.itemR(field, "strength")
+ elif field.type == 'MAGNET':
+ split.itemR(field, "strength")
+ split.itemR(field, "planar")
+ elif field.type == 'HARMONIC':
col = split.column()
- col.itemR(field, "planar")
-
- elif field.type == "HARMONIC":
col.itemR(field, "strength")
col.itemR(field, "harmonic_damping", text="Damping")
col = split.column()
- col.itemR(field, "surface")
col.itemR(field, "planar")
+ col.itemR(field, "surface")
- elif field.type == "TEXTURE":
+ elif field.type == 'TEXTURE':
+ col = split.column()
col.itemR(field, "strength")
col.itemR(field, "texture", text="")
- col.itemR(field, "texture_mode")
+ col.itemR(field, "texture_mode", text="")
col.itemR(field, "texture_nabla")
col = split.column()
@@ -85,70 +79,69 @@ class PHYSICS_PT_field(PhysicButtonsPanel):
col.itemR(field, "root_coordinates")
col.itemR(field, "force_2d")
- if field.type in ("HARMONIC", "SPHERICAL", "CHARGE", "WIND", "VORTEX", "TEXTURE", "MAGNET", "BOID"):
- layout.itemS()
+ if field.type in ('HARMONIC', 'SPHERICAL', 'CHARGE', 'WIND', 'VORTEX', 'TEXTURE', 'MAGNET', 'BOID'):
+
layout.itemL(text="Falloff:")
layout.itemR(field, "falloff_type", expand=True)
+
+ split = layout.split(percentage=0.35)
- row = layout.row()
- row.itemR(field, "falloff_power", text="Power")
- row.itemR(field, "positive_z", text="Positive Z")
-
- layout.itemS()
- split = layout.split()
-
col = split.column()
- col.itemR(field, "use_min_distance", text="Minimum")
+ col.itemR(field, "positive_z", text="Positive Z")
+ col.itemR(field, "use_min_distance", text="Use Minimum")
+ col.itemR(field, "use_max_distance", text="Use Maximum")
+
+ col = split.column()
+ col.itemR(field, "falloff_power", text="Power")
+
sub = col.column()
sub.active = field.use_min_distance
sub.itemR(field, "minimum_distance", text="Distance")
- col = split.column()
- col.itemR(field, "use_max_distance", text="Maximum")
sub = col.column()
sub.active = field.use_max_distance
sub.itemR(field, "maximum_distance", text="Distance")
- if field.falloff_type == "CONE":
- layout.itemS()
- layout.itemL(text="Angular:")
+ if field.falloff_type == 'CONE':
+
+ layout.itemS()
- row = layout.row()
- row.itemR(field, "radial_falloff", text="Power")
- row.itemL()
+ split = layout.split(percentage=0.35)
- split = layout.split()
+ col = split.column()
+ col.itemL(text="Angular:")
+ col.itemR(field, "use_radial_min", text="Use Minimum")
+ col.itemR(field, "use_radial_max", text="Use Maximum")
col = split.column()
- col.itemR(field, "use_radial_min", text="Minimum")
+ col.itemR(field, "radial_falloff", text="Power")
+
sub = col.column()
sub.active = field.use_radial_min
sub.itemR(field, "radial_minimum", text="Angle")
- col = split.column()
- col.itemR(field, "use_radial_max", text="Maximum")
sub = col.column()
sub.active = field.use_radial_max
sub.itemR(field, "radial_maximum", text="Angle")
- elif field.falloff_type == "TUBE":
- layout.itemS()
- layout.itemL(text="Radial:")
+ elif field.falloff_type == 'TUBE':
- row = layout.row()
- row.itemR(field, "radial_falloff", text="Power")
- row.itemL()
+ layout.itemS()
- split = layout.split()
+ split = layout.split(percentage=0.35)
+
+ col = split.column()
+ col.itemL(text="Radial:")
+ col.itemR(field, "use_radial_min", text="Use Minimum")
+ col.itemR(field, "use_radial_max", text="Use Maximum")
col = split.column()
- col.itemR(field, "use_radial_min", text="Minimum")
+ col.itemR(field, "radial_falloff", text="Power")
+
sub = col.column()
sub.active = field.use_radial_min
sub.itemR(field, "radial_minimum", text="Distance")
- col = split.column()
- col.itemR(field, "use_radial_max", text="Maximum")
sub = col.column()
sub.active = field.use_radial_max
sub.itemR(field, "radial_maximum", text="Distance")