Commit: 415adf72636b2e5981b1b68f4ff5ae2e60a965c6
Author: Brecht Van Lommel
Date: Fri Feb 21 15:03:24 2014 +0100
https://developer.blender.org/rB415adf72636b2e5981b1b68f4ff5ae2e60a965c6
Fix T38740: multi-user metaballs not rendering in Cycles.
===================================================================
M intern/cycles/blender/blender_object.cpp
===================================================================
diff --git a/intern/cycles/blender/blender_object.cpp
b/intern/cycles/blender/blender_object.cpp
index cc52717..49da938 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;
}
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
