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:
authorSybren A. Stüvel <sybren@stuvel.eu>2017-10-29 17:14:04 +0300
committerSybren A. Stüvel <sybren@stuvel.eu>2017-10-29 17:14:04 +0300
commit7530c54c3cf38016d9038e6879c8ee2b1bd14c9e (patch)
treea43bf60f8267855f7950017b53c04fd88a5207ac /source/blender/alembic
parent1186dec916737b69afecd15030736f6d3361694e (diff)
parentd9000495e1273052c895c754fd2aa56c9dbe6175 (diff)
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/alembic')
-rw-r--r--source/blender/alembic/intern/abc_mesh.cc5
1 files changed, 4 insertions, 1 deletions
diff --git a/source/blender/alembic/intern/abc_mesh.cc b/source/blender/alembic/intern/abc_mesh.cc
index de0ed421eb7..7af25fdbe6c 100644
--- a/source/blender/alembic/intern/abc_mesh.cc
+++ b/source/blender/alembic/intern/abc_mesh.cc
@@ -1076,7 +1076,10 @@ DerivedMesh *AbcMeshReader::read_derivedmesh(DerivedMesh *dm,
ImportSettings settings;
settings.read_flag |= read_flag;
- if (dm->getNumVerts(dm) != positions->size()) {
+ bool topology_changed = positions->size() != dm->getNumVerts(dm) ||
+ face_counts->size() != dm->getNumPolys(dm) ||
+ face_indices->size() != dm->getNumLoops(dm);
+ if (topology_changed) {
new_dm = CDDM_from_template(dm,
positions->size(),
0,