[Bf-blender-cvs] [4ddab491b0e] temp-sybren-alembic: Alembic: Removed const_cast<>, no longer necessary with Alembic 1.7.1
Sybren A. Stüvel
noreply at git.blender.org
Tue Apr 4 14:09:30 CEST 2017
Commit: 4ddab491b0e73badff68333af255281de8ef7192
Author: Sybren A. Stüvel
Date: Tue Apr 4 14:09:17 2017 +0200
Branches: temp-sybren-alembic
https://developer.blender.org/rB4ddab491b0e73badff68333af255281de8ef7192
Alembic: Removed const_cast<>, no longer necessary with Alembic 1.7.1
For more info, see my bug report at Alembic's github:
https://github.com/alembic/alembic/issues/110
===================================================================
M source/blender/alembic/intern/abc_object.cc
===================================================================
diff --git a/source/blender/alembic/intern/abc_object.cc b/source/blender/alembic/intern/abc_object.cc
index ac95b341cb1..6a9facd15af 100644
--- a/source/blender/alembic/intern/abc_object.cc
+++ b/source/blender/alembic/intern/abc_object.cc
@@ -285,11 +285,7 @@ void AbcObjectReader::read_matrix(float r_mat[4][4], const float time,
has_alembic_parent = false;
}
else {
- /* Sybren: getInhertisXforms() should be a const function, see Alembic
- * pull request at https://github.com/alembic/alembic/pull/111 and
- * bug report at https://github.com/alembic/alembic/issues/110 */
- IXformSchema & schema_mutable = const_cast<IXformSchema &>(schema);
- has_alembic_parent = ixform_parent && schema_mutable.getInheritsXforms();
+ has_alembic_parent = ixform_parent && schema.getInheritsXforms();
}
const Imath::M44d matrix = get_matrix(schema, time);
More information about the Bf-blender-cvs
mailing list