diff options
| author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2014-02-21 18:03:24 +0400 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2014-02-21 18:03:24 +0400 |
| commit | 415adf72636b2e5981b1b68f4ff5ae2e60a965c6 (patch) | |
| tree | 492d74ab755a32c01cce334320f41a48b5322f5a | |
| parent | 5f18d863a9782c728ae4e9809cadffdbfe16632f (diff) | |
Fix T38740: multi-user metaballs not rendering in Cycles.
| -rw-r--r-- | intern/cycles/blender/blender_object.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
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; } |