[Bf-blender-cvs] [bf583fb] alembic_basic_io: Cleanup: has_property.

[Kévin Dietrich]

Commit: bf583fb508e25caffac826c534a0ae2ae477ff4b
Author: Kévin Dietrich
Date:   Thu Jun 16 17:39:40 2016 +0200
Branches: alembic_basic_io
https://developer.blender.org/rBbf583fb508e25caffac826c534a0ae2ae477ff4b

Cleanup: has_property.

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

M	source/blender/alembic/intern/abc_util.cc
M	source/blender/alembic/intern/abc_util.h
M	source/blender/alembic/intern/alembic_capi.cc

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

diff --git a/source/blender/alembic/intern/abc_util.cc b/source/blender/alembic/intern/abc_util.cc
index a0f874a..a9e11f9 100644
--- a/source/blender/alembic/intern/abc_util.cc
+++ b/source/blender/alembic/intern/abc_util.cc
@@ -202,13 +202,6 @@ void create_transform_matrix(float r_mat[4][4])
 	copy_m4_m4(r_mat, transform_mat);
 }
 
-/* Return whether or not this object is a Maya locator, which is similar to
- * empties used as parent object in Blender. */
-bool is_locator(const Alembic::AbcGeom::IObject &object)
-{
-	return object.getProperties().getPropertyHeader("locator") != NULL;
-}
-
 void create_input_transform(const Alembic::AbcGeom::ISampleSelector &sample_sel,
                             const Alembic::AbcGeom::IXform &ixform, Object *ob,
                             float r_mat[4][4], float scale)
diff --git a/source/blender/alembic/intern/abc_util.h b/source/blender/alembic/intern/abc_util.h
index 6f246cc..f67beae 100644
--- a/source/blender/alembic/intern/abc_util.h
+++ b/source/blender/alembic/intern/abc_util.h
@@ -50,8 +50,6 @@ bool begins_with(const TContainer &input, const TContainer &match)
 	        && std::equal(match.begin(), match.end(), input.begin());
 }
 
-bool is_locator(const Alembic::AbcGeom::IObject &object);
-
 void create_input_transform(const Alembic::AbcGeom::ISampleSelector &sample_sel,
                             const Alembic::AbcGeom::IXform &ixform, Object *ob,
                             float r_mat[4][4], float scale);
diff --git a/source/blender/alembic/intern/alembic_capi.cc b/source/blender/alembic/intern/alembic_capi.cc
index 4f9a142..7bc1c38 100644
--- a/source/blender/alembic/intern/alembic_capi.cc
+++ b/source/blender/alembic/intern/alembic_capi.cc
@@ -406,7 +406,9 @@ static void visit_object(const IObject &object,
 		if (IXform::matches(md)) {
 			bool create_xform = false;
 
-			if (is_locator(child)) {
+			/* Check whether or not this object is a Maya locator, which is
+			 * similar to empties used as parent object in Blender. */
+			if (has_property(child.getProperties(), "locator")) {
 				create_xform = true;
 			}
 			else {