diff options
| author | Lukas Tönne <lukas.toenne@gmail.com> | 2015-05-22 19:04:44 +0300 |
|---|---|---|
| committer | Lukas Tönne <lukas.toenne@gmail.com> | 2015-05-22 19:04:44 +0300 |
| commit | bac7573dc50e2ebf48f583ebebd470fc36b55db4 (patch) | |
| tree | fdad76a8ba5a8a7bf8e3bef97b3599f522576d5f /intern | |
| parent | 0ee5fa7745633a671c6c7cd3aebb697c69c6d2e2 (diff) | |
| parent | 466d17cffdd5c47a459c6206dd44153ce4fb5092 (diff) | |
Merge branch 'alembic' into gooseberry
Conflicts:
source/blender/blenkernel/BKE_key.h
source/blender/blenkernel/intern/key.c
source/blender/bmesh/intern/bmesh_strands_conv.c
Diffstat (limited to 'intern')
| -rw-r--r-- | intern/cycles/blender/blender_curves.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/intern/cycles/blender/blender_curves.cpp b/intern/cycles/blender/blender_curves.cpp index e417a9f54bc..8d230038b8c 100644 --- a/intern/cycles/blender/blender_curves.cpp +++ b/intern/cycles/blender/blender_curves.cpp @@ -373,7 +373,7 @@ static bool ObtainCacheStrandsData(Mesh *mesh, BL::Scene /*b_scene*/, BL::Object int ivert = 0; for(; icurve < totcurves; ++icurve) { CurveT b_curve = b_strands.curves[icurve]; - int numverts = b_curve.size(); + int numverts = b_curve.render_size(); int usedverts = 0; CData->curve_firstkey.push_back(keyno); |