diff options
| author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2008-05-01 21:31:01 +0400 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2008-05-01 21:31:01 +0400 |
| commit | 0d1aa8d7bfc83162dc14616e4d588939d9361ba1 (patch) | |
| tree | 6c6b2f6ece9cd8978fc08ce1eaa796b5cd695df7 /source/blender/src/buttons_object.c | |
| parent | 31adad5b4d8dd7728a1a4d21ede7b34e6ff01a89 (diff) | |
Fix for bug #10144: "set editable" on a disabled particle system
could cause crashes.
Fix related to bug #10198: particle mode didn't respect undo steps
set to 0.
Also made the memory statistics print (ctrl+alt+shift+q) use the
more human readable form to give an overview, instead of printing
out a python script.
Diffstat (limited to 'source/blender/src/buttons_object.c')
| -rw-r--r-- | source/blender/src/buttons_object.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/source/blender/src/buttons_object.c b/source/blender/src/buttons_object.c index d58a283b6d1..37becdc8912 100644 --- a/source/blender/src/buttons_object.c +++ b/source/blender/src/buttons_object.c @@ -3130,9 +3130,13 @@ void do_effects_panels(unsigned short event) } } else { - psys->flag |= PSYS_EDITED; - if(G.f & G_PARTICLEEDIT) - PE_create_particle_edit(ob, psys); + if(psys_check_enabled(ob, psys)) { + psys->flag |= PSYS_EDITED; + if(G.f & G_PARTICLEEDIT) + PE_create_particle_edit(ob, psys); + } + else + error("Particle system not enabled, skipping set editable"); } } case B_FIELD_DEP: |