[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [42438] trunk/blender/source/blender/ makesrna/intern/rna_object_api.c: Fix #29507: cycles rendering of metaball animations not working.

[Brecht Van Lommel]

Revision: 42438
          
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=42438
Author:   blendix
Date:     2011-12-05 15:57:57 +0000 (Mon, 05 Dec 2011)
Log Message:
-----------
Fix #29507: cycles rendering of metaball animations not working.

Modified Paths:
--------------
    trunk/blender/source/blender/makesrna/intern/rna_object_api.c

Modified: trunk/blender/source/blender/makesrna/intern/rna_object_api.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_object_api.c       
2011-12-05 15:32:17 UTC (rev 42437)
+++ trunk/blender/source/blender/makesrna/intern/rna_object_api.c       
2011-12-05 15:57:57 UTC (rev 42438)
@@ -130,7 +130,7 @@
 
        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 @@
                        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;
 
        }

_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs