From 415adf72636b2e5981b1b68f4ff5ae2e60a965c6 Mon Sep 17 00:00:00 2001 From: Brecht Van Lommel Date: Fri, 21 Feb 2014 15:03:24 +0100 Subject: Fix T38740: multi-user metaballs not rendering in Cycles. --- intern/cycles/blender/blender_object.cpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/intern/cycles/blender/blender_object.cpp b/intern/cycles/blender/blender_object.cpp index cc52717fdb6..49da9384406 100644 --- a/intern/cycles/blender/blender_object.cpp +++ b/intern/cycles/blender/blender_object.cpp @@ -38,7 +38,11 @@ CCL_NAMESPACE_BEGIN bool BlenderSync::BKE_object_is_modified(BL::Object b_ob) { /* test if we can instance or if the object is modified */ - if(ccl::BKE_object_is_modified(b_ob, b_scene, preview)) { + if(b_ob.type() == BL::Object::type_META) { + /* multi-user and dupli metaballs are fused, can't instance */ + return true; + } + else if(ccl::BKE_object_is_modified(b_ob, b_scene, preview)) { /* modifiers */ return true; } -- cgit v1.2.3