diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2011-11-11 10:25:45 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2011-11-11 10:25:45 +0400 |
| commit | 92d35b74e79e63ae95732cf3161e84ace1e79e59 (patch) | |
| tree | 19a8ecf74bfcae5187a4e25520f4e55384e7707b /source/blender/blenkernel/intern/particle.c | |
| parent | 67386c003d5d4bd5355323acdfbef1aa9fa2b71d (diff) | |
| parent | afeb0eeaf0e8caf5e46a5dd6fbea3786e9fb1354 (diff) | |
svn merge -r41722:41723 ^/trunk/blender
Diffstat (limited to 'source/blender/blenkernel/intern/particle.c')
| -rw-r--r-- | source/blender/blenkernel/intern/particle.c | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/source/blender/blenkernel/intern/particle.c b/source/blender/blenkernel/intern/particle.c index 6de1c12287c..645d983bb7a 100644 --- a/source/blender/blenkernel/intern/particle.c +++ b/source/blender/blenkernel/intern/particle.c @@ -45,6 +45,7 @@ #include "DNA_particle_types.h" #include "DNA_smoke_types.h" #include "DNA_scene_types.h" +#include "DNA_dynamicpaint_types.h" #include "BLI_blenlib.h" #include "BLI_math.h" @@ -3455,6 +3456,14 @@ void object_remove_particle_system(Scene *scene, Object *ob) smd->flow->psys = NULL; } + if((md = modifiers_findByType(ob, eModifierType_DynamicPaint))) + { + DynamicPaintModifierData *pmd = (DynamicPaintModifierData *)md; + if(pmd->brush && pmd->brush->psys) + if(pmd->brush->psys == psys) + pmd->brush->psys = NULL; + } + /* clear modifier */ psmd= psys_get_modifier(ob, psys); BLI_remlink(&ob->modifiers, psmd); |