diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2011-12-29 02:55:45 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2011-12-29 02:55:45 +0400 |
| commit | cb8090d4c816875580a485a6c7f5ec900030cd56 (patch) | |
| tree | 88f0ce88e920f55490a0637ea3aa1a84e3ea4343 /source/blender/modifiers/intern/MOD_fluidsim_util.c | |
| parent | 948a76c8d00d733eba97c4005ca6e4490e80814b (diff) | |
| parent | 1297f72f787dc71168a4766c1f7234626fbfe9db (diff) | |
svn merge ^/trunk/blender -r42940:42953
Diffstat (limited to 'source/blender/modifiers/intern/MOD_fluidsim_util.c')
| -rw-r--r-- | source/blender/modifiers/intern/MOD_fluidsim_util.c | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/source/blender/modifiers/intern/MOD_fluidsim_util.c b/source/blender/modifiers/intern/MOD_fluidsim_util.c index 0b0df57d63d..fe6ddb03c64 100644 --- a/source/blender/modifiers/intern/MOD_fluidsim_util.c +++ b/source/blender/modifiers/intern/MOD_fluidsim_util.c @@ -500,15 +500,17 @@ static DerivedMesh *fluidsim_read_cache(Object *ob, DerivedMesh *orgdm, Fluidsim // assign material + flags to new dm mface = orgdm->getTessFaceArray(orgdm); - mat_nr = mface[0].mat_nr; - flag = mface[0].flag; + if(mface) { + mat_nr = mface[0].mat_nr; + flag = mface[0].flag; - mface = dm->getTessFaceArray(dm); - numfaces = dm->getNumTessFaces(dm); - for(i=0; i<numfaces; i++) - { - mface[i].mat_nr = mat_nr; - mface[i].flag = flag; + mface = dm->getTessFaceArray(dm); + numfaces = dm->getNumTessFaces(dm); + for(i=0; i<numfaces; i++) + { + mface[i].mat_nr = mat_nr; + mface[i].flag = flag; + } } // load vertex velocities, if they exist... |