diff options
author | Jiri Hnidek <jiri.hnidek@tul.cz> | 2004-11-20 14:59:44 +0300 |
---|---|---|
committer | Jiri Hnidek <jiri.hnidek@tul.cz> | 2004-11-20 14:59:44 +0300 |
commit | cbb66c68f02ff801ba48b14f485287ca9ff615ae (patch) | |
tree | 099cfb5173c6ef67c5108256a5539943361d02cb /source/blender/blenkernel/intern/mball.c | |
parent | a91f7ff763304dddf7f71fdf99fb39c48a1b8f40 (diff) |
- bug fix #1843
https://projects.blender.org/tracker/index.php?func=detail&aid=1843&group_id=9&atid=125
function find_basis_mball() sometimes returned duplicated MetaBall as basis mball, which caused crash of Blender. It happened only when basis MBall object was used for duplication. It was propably caused by some changes in duplicator code.
Diffstat (limited to 'source/blender/blenkernel/intern/mball.c')
-rw-r--r-- | source/blender/blenkernel/intern/mball.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/source/blender/blenkernel/intern/mball.c b/source/blender/blenkernel/intern/mball.c index e58bdfeda2b..1f870f47be2 100644 --- a/source/blender/blenkernel/intern/mball.c +++ b/source/blender/blenkernel/intern/mball.c @@ -329,8 +329,10 @@ Object *find_basis_mball(Object *basis) else ml= ((MetaBall*)ob->data)->elems.first; if(obnr<basisnr){ - basis= ob; - basisnr= obnr; + if(!(ob->flag & OB_FROMDUPLI)){ + basis= ob; + basisnr= obnr; + } } } } |