diff options
| author | Ton Roosendaal <ton@blender.org> | 2006-11-03 15:38:21 +0300 |
|---|---|---|
| committer | Ton Roosendaal <ton@blender.org> | 2006-11-03 15:38:21 +0300 |
| commit | b29c28c43b056a3a9ddc4efc952158fa43f1ccee (patch) | |
| tree | 25ec4e6a68fd1ab9bee21fcc37f1b6c7545d8eec /source/blender/blenkernel | |
| parent | 2055818c997f61039399edfb7ebc25906a4b7be3 (diff) | |
Bugfix #5053
Dupli-group doesn't work yet for metaballs. Code entered an eternal loop,
because the group-duplication code calls again the metaball creation code.
Disabled this. MakeDisplist needs review!
Diffstat (limited to 'source/blender/blenkernel')
| -rw-r--r-- | source/blender/blenkernel/intern/scene.c | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/source/blender/blenkernel/intern/scene.c b/source/blender/blenkernel/intern/scene.c index 65753bc99f3..272bfd38b37 100644 --- a/source/blender/blenkernel/intern/scene.c +++ b/source/blender/blenkernel/intern/scene.c @@ -383,11 +383,14 @@ int next_object(int val, Base **base, Object **ob) else { if(fase!=F_DUPLI) { if( (*base)->object->transflag & OB_DUPLI) { - - duplilist= object_duplilist(G.scene, (*base)->object); - - dupob= duplilist->first; - + /* groups cannot be duplicated for mballs yet, + this enters eternal loop because of + makeDispListMBall getting called inside of group_duplilist */ + if((*base)->object->dup_group == NULL) { + duplilist= object_duplilist(G.scene, (*base)->object); + + dupob= duplilist->first; + } } } /* handle dupli's */ |