[Bf-blender-cvs] [4d28c648859] temp-sybren-alembic: Removed commented-out debug prints and corrected typo in comment.
Sybren A. Stüvel
noreply at git.blender.org
Thu Apr 6 15:21:16 CEST 2017
Commit: 4d28c64885996145136e5b25aeba0d04dbe3c1fa
Author: Sybren A. Stüvel
Date: Thu Apr 6 14:11:57 2017 +0200
Branches: temp-sybren-alembic
https://developer.blender.org/rB4d28c64885996145136e5b25aeba0d04dbe3c1fa
Removed commented-out debug prints and corrected typo in comment.
===================================================================
M source/blender/alembic/intern/alembic_capi.cc
===================================================================
diff --git a/source/blender/alembic/intern/alembic_capi.cc b/source/blender/alembic/intern/alembic_capi.cc
index 380227f2e74..3fcb02dc207 100644
--- a/source/blender/alembic/intern/alembic_capi.cc
+++ b/source/blender/alembic/intern/alembic_capi.cc
@@ -404,7 +404,7 @@ static bool visit_object(const IObject &object,
// The interpretation of data by the children determine the role of this object.
// This is especially important for Xform objects, as they can be either part of a Blender object
- // or a Blender object (empty) themselves.
+ // or a Blender object (Empty) themselves.
size_t children_claiming_this_object = 0;
size_t num_children = object.getNumChildren();
IObject first_claiming_child;
@@ -418,12 +418,9 @@ static bool visit_object(const IObject &object,
}
AbcObjectReader *reader = NULL;
-
const MetaData &md = object.getMetaData();
-// const std::string schema_obj_title = md.get("schemaObjTitle");
-// std::cerr << " - " << object.getFullName() << "(" << schema_obj_title << "): ";
-
bool parent_is_part_of_this_object = false;
+
if (!object.getParent()) {
// The root itself is not an object we should import.
}
@@ -437,41 +434,23 @@ static bool visit_object(const IObject &object,
/* Check whether or not this object is a Maya locator, which is
* similar to empties used as parent object in Blender. */
if (has_property(object.getProperties(), "locator")) {
-// std::cerr << "Maya locator; ";
create_empty = true;
}
else {
-// if (children_claiming_this_object > 0) {
-// std::cerr << children_claiming_this_object << " of its " << num_children
-// << " children used this Xform for themselves, so not creating empty\n";
-// }
-// else {
-// std::cerr << "None of its " << num_children
-// << " children used this Xform for themselves, creating empty\n";
-// }
create_empty = children_claiming_this_object == 0;
}
if (create_empty) {
reader = new AbcEmptyReader(object, settings);
-// std::cerr << "created an AbcEmptyReader "
-// << reader->object_name()
-// << " with data " << reader->data_name();
}
}
else if (IPolyMesh::matches(md)) {
reader = new AbcMeshReader(object, settings);
parent_is_part_of_this_object = true;
-// std::cerr << "created an AbcMeshReader "
-// << reader->object_name()
-// << " with data " << reader->data_name();
}
else if (ISubD::matches(md)) {
reader = new AbcSubDReader(object, settings);
parent_is_part_of_this_object = true;
-// std::cerr << "created an AbcSubDReader "
-// << reader->object_name()
-// << " with data " << reader->data_name();
}
else if (INuPatch::matches(md)) {
#ifdef USE_NURBS
@@ -488,35 +467,23 @@ static bool visit_object(const IObject &object,
else if (ICamera::matches(md)) {
reader = new AbcCameraReader(object, settings);
parent_is_part_of_this_object = true;
-// std::cerr << "created an AbcCameraReader "
-// << reader->object_name()
-// << " with data " << reader->data_name();
}
else if (IPoints::matches(md)) {
reader = new AbcPointsReader(object, settings);
parent_is_part_of_this_object = true;
-// std::cerr << "created an AbcPointsReader "
-// << reader->object_name()
-// << " with data " << reader->data_name();
}
else if (IMaterial::matches(md)) {
/* Pass for now. */
-// std::cerr << "skipping IMaterial objects";
}
else if (ILight::matches(md)) {
/* Pass for now. */
-// std::cerr << "skipping ILight objects";
}
else if (IFaceSet::matches(md)) {
/* Pass, those are handled in the mesh reader. */
-// std::cerr << "skipping IFaceSet objects";
}
else if (ICurves::matches(md)) {
reader = new AbcCurveReader(object, settings);
parent_is_part_of_this_object = true;
-// std::cerr << "created an AbcCurveReader "
-// << reader->object_name()
-// << " with data " << reader->data_name();
}
else {
std::cerr << "Alembic object " << full_name
@@ -525,8 +492,6 @@ static bool visit_object(const IObject &object,
<< std::endl;
}
-// std::cerr << std::endl;
-
if (reader) {
readers.push_back(reader);
reader->incref();
More information about the Bf-blender-cvs
mailing list