diff options
author | Ton Roosendaal <ton@blender.org> | 2007-03-05 23:47:59 +0300 |
---|---|---|
committer | Ton Roosendaal <ton@blender.org> | 2007-03-05 23:47:59 +0300 |
commit | bf5dfc651e22c108832305a0bd43e6e3b377f7fd (patch) | |
tree | d7018d9631358124c92190fa6eb5a5f51803b03e /source/blender/blenkernel/intern/anim.c | |
parent | 69a46946e10eb5f688b13f4dbf7a807fa7aa4eb6 (diff) |
bugfix #6163
Dupligroup: the recursive option did not check for the button (flag) to
be set, only for the pointer ->dupli_group
Diffstat (limited to 'source/blender/blenkernel/intern/anim.c')
-rw-r--r-- | source/blender/blenkernel/intern/anim.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/source/blender/blenkernel/intern/anim.c b/source/blender/blenkernel/intern/anim.c index 849a7f316f2..149b30f10e0 100644 --- a/source/blender/blenkernel/intern/anim.c +++ b/source/blender/blenkernel/intern/anim.c @@ -323,7 +323,8 @@ static void group_duplilist(ListBase *lb, Object *ob, int level) Mat4MulMat4(mat, go->ob->obmat, ob->obmat); dob= new_dupli_object(lb, go->ob, mat, ob->lay, 0); dob->no_draw= (dob->origlay & group->layer)==0; - if(go->ob->dup_group) { + + if(go->ob->dup_group && (go->ob->transflag & OB_DUPLIGROUP)) { Mat4CpyMat4(dob->ob->obmat, dob->mat); group_duplilist(lb, go->ob, level+1); Mat4CpyMat4(dob->ob->obmat, dob->omat); |