diff options
author | Campbell Barton <ideasman42@gmail.com> | 2019-03-06 16:07:23 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2019-03-06 16:10:04 +0300 |
commit | 92094c76a949fb9ad9f85ea09aa1f518b402a916 (patch) | |
tree | 25ceb40034df4564c6c54f2ac30ebcb6329ce648 /source/blender/editors/physics | |
parent | ebcea3029d8ffa893431620947caf7e16e6fb8e9 (diff) |
DNA: remove none particle brush & deprecated flags
The none brush doesn't make sense to have anymore with the tool system.
Also remove deprecated flags & types for object, armature & text.
Diffstat (limited to 'source/blender/editors/physics')
-rw-r--r-- | source/blender/editors/physics/particle_object.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/source/blender/editors/physics/particle_object.c b/source/blender/editors/physics/particle_object.c index 3b063fd7164..e0903a9d7c5 100644 --- a/source/blender/editors/physics/particle_object.c +++ b/source/blender/editors/physics/particle_object.c @@ -622,8 +622,9 @@ static void disconnect_hair( psys->flag |= PSYS_GLOBAL_HAIR; - if (ELEM(pset->brushtype, PE_BRUSH_ADD, PE_BRUSH_PUFF)) - pset->brushtype = PE_BRUSH_NONE; + if (ELEM(pset->brushtype, PE_BRUSH_ADD, PE_BRUSH_PUFF)) { + pset->brushtype = PE_BRUSH_COMB; + } PE_update_object(depsgraph, scene, ob, 0); } |