diff options
author | Campbell Barton <ideasman42@gmail.com> | 2009-10-15 21:59:42 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2009-10-15 21:59:42 +0400 |
commit | d464e2454eb4816f58786fd4bbd419c759e764dc (patch) | |
tree | 581ee07159def319032ff485801805d816d3d8f8 /source/blender/blenkernel | |
parent | bd0fee9a4c9212c74619cdfbf4e524f0a57297fd (diff) |
move view3d keymaps so edit&paint mode keymaps override removed workaround that prevented switching directly from editmode to paint modes
+ other minor changes
Diffstat (limited to 'source/blender/blenkernel')
-rw-r--r-- | source/blender/blenkernel/BKE_particle.h | 1 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/particle.c | 8 |
2 files changed, 9 insertions, 0 deletions
diff --git a/source/blender/blenkernel/BKE_particle.h b/source/blender/blenkernel/BKE_particle.h index e9285782a1e..2291601bd47 100644 --- a/source/blender/blenkernel/BKE_particle.h +++ b/source/blender/blenkernel/BKE_particle.h @@ -200,6 +200,7 @@ struct Object *psys_get_lattice(struct ParticleSimulationData *sim); int psys_in_edit_mode(struct Scene *scene, struct ParticleSystem *psys); int psys_check_enabled(struct Object *ob, struct ParticleSystem *psys); +int psys_check_edited(struct ParticleSystem *psys); void psys_check_group_weights(struct ParticleSettings *part); diff --git a/source/blender/blenkernel/intern/particle.c b/source/blender/blenkernel/intern/particle.c index 011d5c3f134..ea8562c0ca8 100644 --- a/source/blender/blenkernel/intern/particle.c +++ b/source/blender/blenkernel/intern/particle.c @@ -298,6 +298,14 @@ int psys_check_enabled(Object *ob, ParticleSystem *psys) return 1; } +int psys_check_edited(ParticleSystem *psys) +{ + if(psys->part && psys->part->type==PART_HAIR) + return (psys->flag & PSYS_EDITED || (psys->edit && psys->edit->edited)); + else + return (psys->pointcache->edit && psys->pointcache->edit->edited); +} + void psys_check_group_weights(ParticleSettings *part) { ParticleDupliWeight *dw, *tdw; |