[Bf-blender-cvs] [34f3c00] alembic_basic_io: Fix loop normals bot being read.

[Kévin Dietrich]

Commit: 34f3c007604e58e9f394e9efd13d0f624811569f
Author: Kévin Dietrich
Date:   Thu Jul 14 08:29:37 2016 +0200
Branches: alembic_basic_io
https://developer.blender.org/rB34f3c007604e58e9f394e9efd13d0f624811569f

Fix loop normals bot being read.

===================================================================

M	source/blender/alembic/intern/abc_mesh.cc
M	source/blender/alembic/intern/alembic_capi.cc

===================================================================

diff --git a/source/blender/alembic/intern/abc_mesh.cc b/source/blender/alembic/intern/abc_mesh.cc
index e813f7f..a5f7c4e 100644
--- a/source/blender/alembic/intern/abc_mesh.cc
+++ b/source/blender/alembic/intern/abc_mesh.cc
@@ -830,6 +830,7 @@ ABC_INLINE CDStreamConfig create_config(Mesh *mesh)
 	config.totpoly = mesh->totpoly;
 	config.totloop = mesh->totloop;
 	config.user_data = mesh;
+	config.loopdata = &mesh->ldata;
 	config.add_customdata_cb = add_customdata_cb;
 
 	return config;
@@ -958,10 +959,10 @@ ABC_INLINE void read_uvs_params(CDStreamConfig &config,
 }
 
 ABC_INLINE void read_normals_params(AbcMeshData &abc_data,
-                                    const IN3fGeomParam normals,
+                                    const IN3fGeomParam &normals,
                                     const ISampleSelector &selector)
 {
-	if (normals.valid()) {
+	if (!normals.valid()) {
 		return;
 	}
 
diff --git a/source/blender/alembic/intern/alembic_capi.cc b/source/blender/alembic/intern/alembic_capi.cc
index 36602c4..d8d0ac2 100644
--- a/source/blender/alembic/intern/alembic_capi.cc
+++ b/source/blender/alembic/intern/alembic_capi.cc
@@ -859,6 +859,7 @@ static DerivedMesh *read_mesh_sample(DerivedMesh *dm, const IObject &iobject, co
 	config.mpoly = dm->getPolyArray(dm);
 	config.totloop = dm->getNumLoops(dm);
 	config.totpoly = dm->getNumPolys(dm);
+	config.loopdata = dm->getLoopDataLayout(dm);
 	config.add_customdata_cb = add_customdata_cb;
 
 	bool do_normals = false;
@@ -907,6 +908,7 @@ static DerivedMesh *read_subd_sample(DerivedMesh *dm, const IObject &iobject, co
 	config.mpoly = dm->getPolyArray(dm);
 	config.totloop = dm->getNumLoops(dm);
 	config.totpoly = dm->getNumPolys(dm);
+	config.loopdata = dm->getLoopDataLayout(dm);
 	config.add_customdata_cb = add_customdata_cb;
 
 	read_subd_sample(schema, sample_sel, config);