Fix T38740: multi-user metaballs not rendering in Cycles.
authorBrecht Van Lommel <brechtvanlommel@gmail.com>
Fri, 21 Feb 2014 14:03:24 +0000 (15:03 +0100)
committerBrecht Van Lommel <brechtvanlommel@gmail.com>
Fri, 21 Feb 2014 14:03:24 +0000 (15:03 +0100)
intern/cycles/blender/blender_object.cpp

index cc52717fdb651a00119b9ed5d02a60e3170c202c..49da938440624a645ea44600cc71dc087882b568 100644 (file)
@@ -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;
        }