Paths

Table of Contentst

Differential D5752

Fix T69488: Hair particles: rekey disolves the hair then crashes
ClosedPublic
Actions

Authored by Philipp Oeser (lichtwerk) on Sep 11 2019, 11:37 AM.

Tags

None

Subscribers

None

Details

Reviewers

Sergey Sharybin (sergey)

Maniphest Tasks

T69488: Hair particles: hair particle rekey disolves the hair, then crashes Blender

Commits

rBcf2c09002fae: Fix T69488: Hair particles: rekey disolves the hair then crashes

Summary

caused by rB914427afd512.

I assume the changes in above commit [exclusion of handling
PT_CACHE_EDIT_UPDATE_PARTICLE_FROM_EVAL] were meant for
PE_create_current only?
Because atm. this basically gets skipped for everything calling
PE_get_current (this passes a NULL depsgraph as opposed to
PE_create_current)

Since there are many calls of PE_get_current I can imagine this
affecting other bugs as well?

Diff Detail

Repository: rB Blender

Event Timeline

Philipp Oeser (lichtwerk) created this revision.Sep 11 2019, 11:37 AM

Harbormaster completed remote builds in B4898: Diff 18086.Sep 11 2019, 11:37 AM

Sounds like passing depsgraph to PE_get_current() will make things more clear and less fragile?

Otherwise, maybe the entire check can be reduced to if (edit), doesn't seem that this code is currently run for renderers. Would be cool to find a way to make renderers being able to visualize currently editing hair though.

In D5752#132384, @Sergey Sharybin (sergey) wrote:

Sounds like passing depsgraph to PE_get_current() will make things more clear and less fragile?

Will update accordingly...

Otherwise, maybe the entire check can be reduced to if (edit), doesn't seem that this code is currently run for renderers.

thought that would reintroduce T66686: Crash on Particle Edit, then Render, but it actually doesnt... so looks like this is an alternative...

pass depsgraph to PE_get_current() instead

there are two RNA cases where I have to pass NULL, namely

rna_ParticleEdit_editable_get
rna_ParticleEdit_hair_get

I guess these should be fine though (no functional change to current master)

Harbormaster completed remote builds in B5015: Diff 18333.Sep 18 2019, 5:11 PM

Just reading the code seems fine.
If you've tested and it works please go ahead and commit :)

This revision is now accepted and ready to land.Sep 26 2019, 4:38 PM

Closed by commit rBcf2c09002fae: Fix T69488: Hair particles: rekey disolves the hair then crashes (authored by Philipp Oeser (lichtwerk)). · Explain WhySep 26 2019, 5:34 PM

This revision was automatically updated to reflect the committed changes.

Philipp Oeser (lichtwerk) added a commit: rBcf2c09002fae: Fix T69488: Hair particles: rekey disolves the hair then crashes.

Revision Contents
Changeset List

Path

Size

source/

blender/

editors/

include/

10 lines

physics/

particle_edit.c

76 lines

particle_edit_undo.c

9 lines

space_view3d/

2 lines

transform/

transform_convert.c

5 lines

transform_convert_particle.c

4 lines

transform_generics.c

2 lines

transform_gizmo_3d.c

2 lines

makesrna/

intern/

rna_sculpt_paint.c

10 lines

Diff 18523

source/blender/editors/include/ED_particle.h

Loading...

source/blender/editors/physics/particle_edit.c

Loading...

source/blender/editors/physics/particle_edit_undo.c

Loading...

source/blender/editors/space_view3d/view3d_edit.c

Loading...

source/blender/editors/transform/transform_convert.c

Loading...

source/blender/editors/transform/transform_convert_particle.c

Loading...

source/blender/editors/transform/transform_generics.c

Loading...

source/blender/editors/transform/transform_gizmo_3d.c

Loading...

source/blender/makesrna/intern/rna_sculpt_paint.c

Loading...