[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [57437] trunk/blender/intern/cycles/ blender/blender_object.cpp: Fix #35730: cycles not rendering dupliverted metaball, needs another special

[Brecht Van Lommel]

Revision: 57437
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=57437
Author:   blendix
Date:     2013-06-13 14:33:18 +0000 (Thu, 13 Jun 2013)
Log Message:
-----------
Fix #35730: cycles not rendering dupliverted metaball, needs another special
exception.

Modified Paths:
--------------
    trunk/blender/intern/cycles/blender/blender_object.cpp

Modified: trunk/blender/intern/cycles/blender/blender_object.cpp
===================================================================
--- trunk/blender/intern/cycles/blender/blender_object.cpp	2013-06-13 14:17:02 UTC (rev 57436)
+++ trunk/blender/intern/cycles/blender/blender_object.cpp	2013-06-13 14:33:18 UTC (rev 57437)
@@ -318,8 +318,12 @@
 	return object;
 }
 
-static bool object_render_hide_original(BL::Object::dupli_type_enum dupli_type)
+static bool object_render_hide_original(BL::Object::type_enum ob_type, BL::Object::dupli_type_enum dupli_type)
 {
+	/* metaball exception, they duplicate self */
+	if(ob_type == BL::Object::type_META)
+		return false;
+
 	return (dupli_type == BL::Object::dupli_type_VERTS ||
 	        dupli_type == BL::Object::dupli_type_FACES ||
 	        dupli_type == BL::Object::dupli_type_FRAMES);
@@ -352,7 +356,7 @@
 
 	/* hide original object for duplis */
 	BL::Object parent = b_ob.parent();
-	if(parent && object_render_hide_original(parent.dupli_type()))
+	if(parent && object_render_hide_original(b_ob.type(), parent.dupli_type()))
 		if(parent_hide)
 			hide = true;
 
@@ -364,7 +368,7 @@
 {
 	BL::Object parent = b_ob.parent();
 
-	return (parent && object_render_hide_original(parent.dupli_type()));
+	return (parent && object_render_hide_original(b_ob.type(), parent.dupli_type()));
 }
 
 /* Object Loop */