ilusha/blender
1
0
Fork 0
mirror of https://github.com/blender/blender synced 2026-09-29 04:37:17 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix #161532: Undoing from Texture Paint into Particle Edit corrupts data

Browse source 
Particle Edit undo restored its mode by calling
`ED_object_particle_edit_mode_enter_ex()` directly.

When the undo step was decoded while Texture Paint was active, the
previous mode was not exited first. Since Particle Edit mode entry adds
its mode bit with `|=`, the object ended up with the invalid combined
mode `48` (`TEXTURE_PAINT | PARTICLE_EDIT`).

Exit the current mode through its normal lifecycle before restoring
Particle Edit, following the same pattern used by sculpt undo.

Files that were already saved with mode `48` crashed during editor
initialization because `object_mode_op_string()` returned `nullptr`.
Unsupported saved modes are now rejected safely, leaving the object in
Object Mode while preserving its particle and hair data so the file can
be resaved.

Pull Request: https://projects.blender.org/blender/blender/pulls/161542
This commit is contained in:
Tibo Stans 2026-07-21 21:01:47 +02:00 • committed by Sean Kim
parent 443500f17a
commit 64588da11d
5 changed files with 77 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

63
tests/python/ui_simulate/test_undo.py
View file

@ -575,6 +575,69 @@ def view3d_texture_paint_complex():
t.assertEqual(window.view_layer.objects.active.mode, 'OBJECT')
def view3d_particle_edit_undo_from_texture_paint():
import bpy
e, t, window = ui.test_window()
yield from _view3d_startup_area_maximized(e)
def assert_particle_edit_valid():
ob = bpy.context.active_object
t.assertEqual(ob.mode, 'PARTICLE_EDIT')
t.assertEqual(bpy.context.mode, 'PARTICLE')
psys = ob.particle_systems.active
t.assertIsNotNone(psys)
t.assertEqual(psys.settings.type, 'HAIR')
t.assertGreater(len(psys.particles), 0)
t.assertGreater(len(psys.particles[0].hair_keys), 0)
t.assertTrue(bpy.ops.particle.select_all.poll())
yield from ui.call_menu(e, "Add -> Mesh -> Cube")
ob = window.view_layer.objects.active
yield e.ctrl.tab().t() # Texture Paint via the mode pie.
yield from ui.call_operator(e, "Add Texture Paint Slot")
yield e.ret() # Accept popup.
yield e.ctrl.tab().o() # Object mode.
yield from ui.call_operator(e, "Add Particle System Slot")
psys = ob.particle_systems.active
psys.settings.type = 'HAIR'
psys.settings.count = 8
psys.settings.hair_length = 1.0
window.view_layer.update()
yield
# Include the programmatic setup in a memfile undo step through a normal user action.
yield e.r.z().text("15").ret()
yield from ui.call_operator(e, "Particle Edit Toggle")
assert_particle_edit_valid()
# Establish particle-edit undo steps through the same shortcuts a user invokes.
yield e.alt.a() # Deselect all.
yield e.a() # Select all.
yield e.ctrl.tab().t() # Texture Paint via the mode pie.
t.assertEqual(ob.mode, 'TEXTURE_PAINT')
# This used to combine Particle Edit with Texture Paint into invalid mode value 48.
yield e.ctrl.z()
assert_particle_edit_valid()
# Exercise the mode transition in both directions, then repeat the cross-mode undo.
yield e.ctrl.shift.z()
t.assertEqual(bpy.context.active_object.mode, 'TEXTURE_PAINT')
yield e.ctrl.z()
assert_particle_edit_valid()
# Verify the reconstructed Particle Edit session still accepts user operations.
yield e.alt.a()
assert_particle_edit_valid()
yield e.a()
assert_particle_edit_valid()
def view3d_mesh_edit_separate():
e, t, window = ui.test_window()
yield from _view3d_startup_area_maximized(e)