Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergey Sharybin <sergey.vfx@gmail.com>2017-10-04 20:18:05 +0300
committerSergey Sharybin <sergey.vfx@gmail.com>2017-10-04 20:18:05 +0300
commit63c472b4f9f7eae787bf4ce36160a28a1777bc76 (patch)
tree0e3144ddeacb83b7ff2a769af178824b1dea5563 /intern/cycles/blender
parent9422db7796e17bc23a9544d44f2a2e00a9b7e775 (diff)
parent296757804cc2e97a3d95b4e44a6cc5d508e1c345 (diff)
Merge branch 'master' into blender2.8
Diffstat (limited to 'intern/cycles/blender')
-rw-r--r--intern/cycles/blender/blender_object.cpp1
1 files changed, 1 insertions, 0 deletions
diff --git a/intern/cycles/blender/blender_object.cpp b/intern/cycles/blender/blender_object.cpp
index 02cb4dbbe8a..a25ae278058 100644
--- a/intern/cycles/blender/blender_object.cpp
+++ b/intern/cycles/blender/blender_object.cpp
@@ -75,6 +75,7 @@ bool BlenderSync::object_is_mesh(BL::Object& b_ob)
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 {