[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [41836] trunk/blender/source/blender/ makesrna/intern/rna_object_api.c: Object.to_mesh() for metaball objects now only return a mesh for the basis/mother

[Brecht Van Lommel]

Revision: 41836
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=41836
Author:   blendix
Date:     2011-11-14 16:18:44 +0000 (Mon, 14 Nov 2011)
Log Message:
-----------
Object.to_mesh() for metaball objects now only return a mesh for the basis/mother
metaball. This should fix duplicated export of metaballs for python exporters and
cycles.

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-11-14 16:05:44 UTC (rev 41835)
+++ trunk/blender/source/blender/makesrna/intern/rna_object_api.c	2011-11-14 16:18:44 UTC (rev 41836)
@@ -128,16 +128,20 @@
 		free_libblock_us( &G.main->object, tmpobj );
 		break;
 
-	case OB_MBALL:
+	case OB_MBALL: {
 		/* metaballs don't have modifiers, so just convert to mesh */
-		ob = find_basis_mball( sce, ob );
+		Object *basis_ob = find_basis_mball( sce, ob );
 		/* todo, re-generatre for render-res */
 		/* metaball_polygonize(scene, ob) */
 
+		if(ob != basis_ob)
+			return NULL; /* only do basis metaball */
+
 		tmpmesh = add_mesh("Mesh");
 		mball_to_mesh( &ob->disp, tmpmesh );
 		break;
 
+	}
 	case OB_MESH:
 		/* copies object and modifiers (but not the data) */
 		if (cage) {