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
path: root/release
diff options
context:
space:
mode:
Diffstat (limited to 'release')
-rw-r--r--release/ui/buttons_particle.py36
-rw-r--r--release/ui/buttons_physics_cloth.py17
-rw-r--r--release/ui/buttons_physics_softbody.py17
3 files changed, 46 insertions, 24 deletions
diff --git a/release/ui/buttons_particle.py b/release/ui/buttons_particle.py
index f35d15bbb80..dae95dfcc00 100644
--- a/release/ui/buttons_particle.py
+++ b/release/ui/buttons_particle.py
@@ -151,6 +151,13 @@ class PARTICLE_PT_cache(ParticleButtonsPanel):
psys = context.particle_system
part = psys.settings
cache = psys.point_cache
+ layout.set_context_pointer("PointCache", cache)
+
+ row = layout.row()
+ row.template_list(cache, "point_cache_list", cache, "active_point_cache_index")
+ col = row.column(align=True)
+ col.itemO("ptcache.add_new", icon="ICON_ZOOMIN", text="")
+ col.itemO("ptcache.remove", icon="ICON_ZOOMOUT", text="")
row = layout.row()
row.itemL(text="File Name:")
@@ -166,37 +173,38 @@ class PARTICLE_PT_cache(ParticleButtonsPanel):
layout.itemL(text=cache.info)
- split = layout.split()
+ #split = layout.split()
- col = split.column(align=True)
- col.itemR(part, "start")
- col.itemR(part, "end")
+ #col = split.column(align=True)
+ #col.itemR(part, "start")
+ #col.itemR(part, "end")
- col = split.column(align=True)
- col.itemR(part, "lifetime")
- col.itemR(part, "random_lifetime", slider=True)
+ #col = split.column(align=True)
+ #col.itemR(part, "lifetime")
+ #col.itemR(part, "random_lifetime", slider=True)
else:
layout.itemR(cache, "name", text="")
row = layout.row()
if cache.baked == True:
- row.itemO("ptcache.free_bake_particle_system", text="Free Bake")
+ row.itemO("ptcache.free_bake", text="Free Bake")
else:
- row.item_booleanO("ptcache.cache_particle_system", "bake", True, text="Bake")
+ row.item_booleanO("ptcache.bake", "bake", True, text="Bake")
subrow = row.row()
subrow.enabled = (cache.frames_skipped or cache.outdated) and particle_panel_enabled(psys)
- subrow.itemO("ptcache.cache_particle_system", text="Calculate to Current Frame")
+ subrow.itemO("ptcache.bake", "bake", False, text="Calculate to Current Frame")
row = layout.row()
row.enabled = particle_panel_enabled(psys)
- row.itemO("ptcache.bake_from_particles_cache", text="Current Cache to Bake")
+ row.itemO("ptcache.bake_from_cache", text="Current Cache to Bake")
row.itemR(cache, "step");
row = layout.row()
- row.enabled = particle_panel_enabled(psys)
- row.itemR(cache, "quick_cache")
+ subrow = row.row()
+ subrow.enabled = particle_panel_enabled(psys)
+ subrow.itemR(cache, "quick_cache")
row.itemR(cache, "disk_cache")
layout.itemL(text=cache.info)
@@ -206,7 +214,7 @@ class PARTICLE_PT_cache(ParticleButtonsPanel):
row = layout.row()
row.item_booleanO("ptcache.bake_all", "bake", True, text="Bake All Dynamics")
row.itemO("ptcache.free_bake_all", text="Free All Bakes")
- layout.itemO("ptcache.bake_all", text="Update All Dynamics to current frame")
+ layout.itemO("ptcache.bake_all", "bake", False, text="Update All Dynamics to current frame")
# for particles these are figured out automatically
#row.itemR(cache, "start_frame")
diff --git a/release/ui/buttons_physics_cloth.py b/release/ui/buttons_physics_cloth.py
index 1bd1c507ccf..0edf099fa90 100644
--- a/release/ui/buttons_physics_cloth.py
+++ b/release/ui/buttons_physics_cloth.py
@@ -85,6 +85,13 @@ class PHYSICS_PT_cloth_cache(PhysicButtonsPanel):
layout = self.layout
cache = context.cloth.point_cache
+ layout.set_context_pointer("PointCache", cache)
+
+ row = layout.row()
+ row.template_list(cache, "point_cache_list", cache, "active_point_cache_index")
+ col = row.column(align=True)
+ col.itemO("ptcache.add_new", icon="ICON_ZOOMIN", text="")
+ col.itemO("ptcache.remove", icon="ICON_ZOOMOUT", text="")
row = layout.row()
row.itemR(cache, "name")
@@ -96,17 +103,17 @@ class PHYSICS_PT_cloth_cache(PhysicButtonsPanel):
row = layout.row()
if cache.baked == True:
- row.itemO("ptcache.free_bake_cloth", text="Free Bake")
+ row.itemO("ptcache.free_bake", text="Free Bake")
else:
- row.item_booleanO("ptcache.cache_cloth", "bake", True, text="Bake")
+ row.item_booleanO("ptcache.bake", "bake", True, text="Bake")
subrow = row.row()
subrow.enabled = cache.frames_skipped or cache.outdated
- subrow.itemO("ptcache.cache_cloth", text="Calculate to Current Frame")
+ subrow.itemO("ptcache.bake", "bake", False, text="Calculate to Current Frame")
row = layout.row()
#row.enabled = particle_panel_enabled(psys)
- row.itemO("ptcache.bake_from_cloth_cache", text="Current Cache to Bake")
+ row.itemO("ptcache.bake_from_cache", text="Current Cache to Bake")
row.itemR(cache, "step");
row = layout.row()
@@ -121,7 +128,7 @@ class PHYSICS_PT_cloth_cache(PhysicButtonsPanel):
row = layout.row()
row.itemO("ptcache.bake_all", "bake", True, text="Bake All Dynamics")
row.itemO("ptcache.free_bake_all", text="Free All Bakes")
- layout.itemO("ptcache.bake_all", text="Update All Dynamics to current frame")
+ layout.itemO("ptcache.bake_all", "bake", False, text="Update All Dynamics to current frame")
class PHYSICS_PT_cloth_collision(PhysicButtonsPanel):
__label__ = "Cloth Collision"
diff --git a/release/ui/buttons_physics_softbody.py b/release/ui/buttons_physics_softbody.py
index c17d6e3bcf9..d0d3475c11b 100644
--- a/release/ui/buttons_physics_softbody.py
+++ b/release/ui/buttons_physics_softbody.py
@@ -63,6 +63,13 @@ class PHYSICS_PT_softbody_cache(PhysicButtonsPanel):
layout = self.layout
cache = context.soft_body.point_cache
+ layout.set_context_pointer("PointCache", cache)
+
+ row = layout.row()
+ row.template_list(cache, "point_cache_list", cache, "active_point_cache_index")
+ col = row.column(align=True)
+ col.itemO("ptcache.add_new", icon="ICON_ZOOMIN", text="")
+ col.itemO("ptcache.remove", icon="ICON_ZOOMOUT", text="")
row = layout.row()
row.itemR(cache, "name")
@@ -74,16 +81,16 @@ class PHYSICS_PT_softbody_cache(PhysicButtonsPanel):
row = layout.row()
if cache.baked == True:
- row.itemO("ptcache.free_bake_softbody", text="Free Bake")
+ row.itemO("ptcache.free_bake", text="Free Bake")
else:
- row.item_booleanO("ptcache.cache_softbody", "bake", True, text="Bake")
+ row.item_booleanO("ptcache.bake", "bake", True, text="Bake")
sub = row.row()
sub.enabled = cache.frames_skipped or cache.outdated
- sub.itemO("ptcache.cache_softbody", text="Calculate to Current Frame")
+ sub.itemO("ptcache.bake", "bake", False, text="Calculate to Current Frame")
row = layout.row()
- row.itemO("ptcache.bake_from_softbody_cache", text="Current Cache to Bake")
+ row.itemO("ptcache.bake_from_cache", text="Current Cache to Bake")
row.itemR(cache, "step");
row = layout.row()
@@ -97,7 +104,7 @@ class PHYSICS_PT_softbody_cache(PhysicButtonsPanel):
row = layout.row()
row.itemO("ptcache.bake_all", "bake", True, text="Bake All Dynamics")
row.itemO("ptcache.free_bake_all", text="Free All Bakes")
- layout.itemO("ptcache.bake_all", text="Update All Dynamics to current frame")
+ layout.itemO("ptcache.bake_all", "bake", False, text="Update All Dynamics to current frame")
class PHYSICS_PT_softbody_goal(PhysicButtonsPanel):
__label__ = "Soft Body Goal"
generated by cgit v1.2.3 (git 2.25.1) at 2024-08-07 17:12:05 +0300