diff options
| author | Bastien Montagne <montagne29@wanadoo.fr> | 2016-03-12 20:55:49 +0300 |
|---|---|---|
| committer | Bastien Montagne <montagne29@wanadoo.fr> | 2016-03-12 20:55:49 +0300 |
| commit | 681becb3592d48a582d962b56f8ce73246060326 (patch) | |
| tree | 2be1da23e0964cc978d5e35ebb54520df3de4b47 /source/blender/editors/physics/particle_object.c | |
| parent | b20f12d835fab4854ef3c06023bb807b0e3f0d91 (diff) | |
Fix related to T47750: Particle disconnect operator: 'all hair' disabled would not work correctly after first op execution.
This is side issue, main one remains and does not look easy to fix, see report for details.
Diffstat (limited to 'source/blender/editors/physics/particle_object.c')
| -rw-r--r-- | source/blender/editors/physics/particle_object.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/source/blender/editors/physics/particle_object.c b/source/blender/editors/physics/particle_object.c index ecd27646562..7aa4c245f11 100644 --- a/source/blender/editors/physics/particle_object.c +++ b/source/blender/editors/physics/particle_object.c @@ -618,7 +618,6 @@ static int disconnect_hair_exec(bContext *C, wmOperator *op) { Scene *scene= CTX_data_scene(C); Object *ob= ED_object_context(C); - PointerRNA ptr = CTX_data_pointer_get_type(C, "particle_system", &RNA_ParticleSystem); ParticleSystem *psys= NULL; const bool all = RNA_boolean_get(op->ptr, "all"); @@ -631,7 +630,7 @@ static int disconnect_hair_exec(bContext *C, wmOperator *op) } } else { - psys = ptr.data; + psys = psys_get_current(ob); disconnect_hair(scene, ob, psys); } |