diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2011-12-05 21:54:33 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2011-12-05 21:54:33 +0400 |
| commit | d97f88d2786ec78df321980cd333408648bd4419 (patch) | |
| tree | 08c93875b62f1eadf4fe876a80817d896002930c /source/blender/makesrna/intern/rna_object_api.c | |
| parent | 824bfa98c3a8350dc9030907d9ad6a5ec5919945 (diff) | |
| parent | c40d8921b8b61c0465a2fe9bca72dc418bf39c7d (diff) | |
svn merge ^/trunk/blender -r42426:42439
Diffstat (limited to 'source/blender/makesrna/intern/rna_object_api.c')
| -rw-r--r-- | source/blender/makesrna/intern/rna_object_api.c | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/source/blender/makesrna/intern/rna_object_api.c b/source/blender/makesrna/intern/rna_object_api.c index 86fa9180d41..75ed4db577f 100644 --- a/source/blender/makesrna/intern/rna_object_api.c +++ b/source/blender/makesrna/intern/rna_object_api.c @@ -130,7 +130,7 @@ Mesh *rna_Object_to_mesh(Object *ob, ReportList *reports, Scene *sce, int apply_ case OB_MBALL: { /* metaballs don't have modifiers, so just convert to mesh */ - Object *basis_ob = find_basis_mball( sce, ob ); + Object *basis_ob = find_basis_mball(sce, ob); /* todo, re-generatre for render-res */ /* metaball_polygonize(scene, ob) */ @@ -138,7 +138,15 @@ Mesh *rna_Object_to_mesh(Object *ob, ReportList *reports, Scene *sce, int apply_ return NULL; /* only do basis metaball */ tmpmesh = add_mesh("Mesh"); - mball_to_mesh( &ob->disp, tmpmesh ); + + if(render) { + ListBase disp = {NULL, NULL}; + makeDispListMBall_forRender(sce, ob, &disp); + mball_to_mesh(&disp, tmpmesh); + freedisplist(&disp); + } + else + mball_to_mesh(&ob->disp, tmpmesh); break; } |