[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [25055] trunk/blender/source/blender/ render/intern/source/convertblender.c: * Fix for earlier fix, only check for basis metaball if the object's actually a metaball

[Matt Ebb]

Revision: 25055
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=25055
Author:   broken
Date:     2009-12-02 00:55:33 +0100 (Wed, 02 Dec 2009)

Log Message:
-----------
* Fix for earlier fix, only check for basis metaball if the object's actually a metaball

Modified Paths:
--------------
    trunk/blender/source/blender/render/intern/source/convertblender.c

Modified: trunk/blender/source/blender/render/intern/source/convertblender.c
===================================================================
--- trunk/blender/source/blender/render/intern/source/convertblender.c	2009-12-01 22:45:56 UTC (rev 25054)
+++ trunk/blender/source/blender/render/intern/source/convertblender.c	2009-12-01 23:55:33 UTC (rev 25055)
@@ -4501,7 +4501,7 @@
 		return 0;
 	
 	/* don't add non-basic meta objects, ends up having renderobjects with no geometry */
-	if (ob!=find_basis_mball(re->scene, ob))
+	if (ob->type == OB_MBALL && ob!=find_basis_mball(re->scene, ob))
 		return 0;
 	
 	if(nolamps && (ob->type==OB_LAMP))