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:
authorBastien Montagne <montagne29@wanadoo.fr>2016-03-14 23:04:30 +0300
committerBastien Montagne <montagne29@wanadoo.fr>2016-03-14 23:04:30 +0300
commita078fe35396a34c8f6440e22c37a3b27e0c1f61a (patch)
treedd498f7ce1daaf77940b38c015e608937d40a853 /release
parent00166ff62e689b7caebdd3a0c4f9051b2739826a (diff)
Fix T47750: Edited hair: disconnect (and connect!) operator do not support redo.
As suggested by Sergey, do not register those anymore, this way we keep undo step, but user cannot 'redo' them (does not work, since cached DM in particle modifier data is not yet re-created by depsgraph update after undo when operator is redone). UI now has two buttons, one to (dic)connect current psys, the other to (dis)connect all. Also fixed similar issue with Connect Hair op.
Diffstat (limited to 'release')
-rw-r--r--release/scripts/startup/bl_ui/properties_particle.py8
1 files changed, 6 insertions, 2 deletions
diff --git a/release/scripts/startup/bl_ui/properties_particle.py b/release/scripts/startup/bl_ui/properties_particle.py
index 207f6f86820..08290f20a69 100644
--- a/release/scripts/startup/bl_ui/properties_particle.py
+++ b/release/scripts/startup/bl_ui/properties_particle.py
@@ -218,9 +218,13 @@ class PARTICLE_PT_context_particles(ParticleButtonsPanel, Panel):
row.prop(part, "hair_step")
if psys is not None and psys.is_edited:
if psys.is_global_hair:
- layout.operator("particle.connect_hair")
+ row = layout.row(align=True)
+ row.operator("particle.connect_hair").all = False
+ row.operator("particle.connect_hair", text="Connect All").all = True
else:
- layout.operator("particle.disconnect_hair")
+ row = layout.row(align=True)
+ row.operator("particle.disconnect_hair").all = False
+ row.operator("particle.disconnect_hair", text="Disconnect All").all = True
elif psys is not None and part.type == 'REACTOR':
split.enabled = particle_panel_enabled(context, psys)
split.prop(psys, "reactor_target_object")