diff options
Diffstat (limited to 'intern/cycles/blender')
| -rw-r--r-- | intern/cycles/blender/object.cpp | 17 |
1 files changed, 7 insertions, 10 deletions
diff --git a/intern/cycles/blender/object.cpp b/intern/cycles/blender/object.cpp index 3800ea0ecd2..698800f9957 100644 --- a/intern/cycles/blender/object.cpp +++ b/intern/cycles/blender/object.cpp @@ -76,18 +76,15 @@ bool BlenderSync::object_is_geometry(BL::Object &b_ob) /* Will be exported attached to mesh. */ return true; } - else if (type == BL::Object::type_CURVE) { - /* Skip exporting curves without faces, overhead can be - * significant if there are many for path animation. */ - BL::Curve b_curve(b_ob_data); - return (b_curve.bevel_object() || b_curve.extrude() != 0.0f || b_curve.bevel_depth() != 0.0f || - b_curve.dimensions() == BL::Curve::dimensions_2D || b_ob.modifiers.length()); - } - else { - return (b_ob_data.is_a(&RNA_Mesh) || b_ob_data.is_a(&RNA_Curve) || - b_ob_data.is_a(&RNA_MetaBall)); + /* Other object types that are not meshes but evaluate to meshes are presented to render engines + * as separate instance objects. Metaballs and surface objects have not been affected by that + * change yet. */ + if (type == BL::Object::type_SURFACE || type == BL::Object::type_META) { + return true; } + + return b_ob_data.is_a(&RNA_Mesh); } bool BlenderSync::object_is_light(BL::Object &b_ob) |