blender
/
blender
136
403
Fork 586
Code Issues 6.2k Pull Requests 760 Projects 19 Wiki Activity

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.
This commit is contained in:
Bastien Montagne 2016-03-12 18:55:49 +01:00
parent b20f12d835
commit 681becb359
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
source/blender/editors/physics/particle_object.c
View File

@ -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);
}