Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTon Roosendaal <ton@blender.org>2004-05-29 21:00:51 +0400
committerTon Roosendaal <ton@blender.org>2004-05-29 21:00:51 +0400
commit690a430bcb36c74ad4f785379805f2226b301306 (patch)
tree302133cc460229c78ae1498cac246267a9f542d8 /source/blender/blenkernel/intern/mball.c
parentdbfe3daec3d5c5093c48ac55ea0192bf3829b6ef (diff)
Counter of mballs, before polygonize, had error in taking linked mball-
data into account, causing errors modeling.
Diffstat (limited to 'source/blender/blenkernel/intern/mball.c')
-rw-r--r--source/blender/blenkernel/intern/mball.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/source/blender/blenkernel/intern/mball.c b/source/blender/blenkernel/intern/mball.c
index f7590f6f0a1..b8776d0b9e5 100644
--- a/source/blender/blenkernel/intern/mball.c
+++ b/source/blender/blenkernel/intern/mball.c
@@ -1554,13 +1554,13 @@ void metaball_polygonize(Object *ob)
char obname[32], name[32];
mb= ob->data;
+ if(G.moving && mb->flag==MB_UPDATE_FAST) return;
freedisplist(&ob->disp);
curindex= totindex= 0;
indices= 0;
thresh= mb->thresh;
- if(G.moving && mb->flag==MB_UPDATE_FAST) return;
/* recount all MetaElems */
splitIDname(ob->id.name+2, obname, &obnr);
@@ -1577,6 +1577,8 @@ void metaball_polygonize(Object *ob)
splitIDname(bob->id.name+2, name, &nr);
if( strcmp(obname, name)==0 ) {
if(bob==G.obedit) ml= editelems.first;
+ /* keep track of linked data too! */
+ else if(ob==G.obedit && bob->data==ob->data) ml= editelems.first;
else ml= ((MetaBall*)bob->data)->elems.first;
}
}