[Bf-blender-cvs] [822d0085af] temp-sybren-alembic: Alembic: added some r_ prefixes for return parameters

[Sybren A. Stüvel]

Commit: 822d0085afa0f1fd8f04c0d8aff7cce75a49af1e
Author: Sybren A. Stüvel
Date:   Thu Mar 2 09:56:57 2017 +0100
Branches: temp-sybren-alembic
https://developer.blender.org/rB822d0085afa0f1fd8f04c0d8aff7cce75a49af1e

Alembic: added some r_ prefixes for return parameters

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

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

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

diff --git a/source/blender/alembic/intern/abc_object.cc b/source/blender/alembic/intern/abc_object.cc
index 88c4fc91ea..c39ad421cd 100644
--- a/source/blender/alembic/intern/abc_object.cc
+++ b/source/blender/alembic/intern/abc_object.cc
@@ -262,7 +262,8 @@ Alembic::AbcGeom::IXform AbcObjectReader::xform()
 	return IXform();
 }
 
-void AbcObjectReader::read_matrix(float mat[4][4], const float time, const float scale, bool &is_constant)
+void AbcObjectReader::read_matrix(float r_mat[4][4], const float time,
+                                  const float scale, bool &is_constant)
 {
 	IXform ixform = xform();
 	if (!ixform) {
@@ -292,7 +293,7 @@ void AbcObjectReader::read_matrix(float mat[4][4], const float time, const float
 	}
 
 	const Imath::M44d matrix = get_matrix(schema, time);
-	convert_matrix(matrix, m_object, mat, scale, has_alembic_parent);
+	convert_matrix(matrix, m_object, r_mat, scale, has_alembic_parent);
 
 	if (has_alembic_parent) {
 		/* In this case, the matrix in Alembic is in local coordinates, so
@@ -301,7 +302,7 @@ void AbcObjectReader::read_matrix(float mat[4][4], const float time, const float
 		 * parent object is already updated for the current timekey, and use its
 		 * world matrix. */
 		BLI_assert(m_object->parent);
-		mul_m4_m4m4(mat, m_object->parent->obmat, mat);
+		mul_m4_m4m4(r_mat, m_object->parent->obmat, r_mat);
 	}
 
 	is_constant = schema.isConstant();
diff --git a/source/blender/alembic/intern/abc_object.h b/source/blender/alembic/intern/abc_object.h
index cf4372b2f5..2e3c353145 100644
--- a/source/blender/alembic/intern/abc_object.h
+++ b/source/blender/alembic/intern/abc_object.h
@@ -187,7 +187,8 @@ public:
 	void incref();
 	void decref();
 
-	void read_matrix(float mat[4][4], const float time, const float scale, bool &is_constant);
+	void read_matrix(float r_mat[4][4], const float time,
+	                 const float scale, bool &is_constant);
 };
 
 Imath::M44d get_matrix(const Alembic::AbcGeom::IXformSchema &schema, const float time);
diff --git a/source/blender/alembic/intern/abc_util.cc b/source/blender/alembic/intern/abc_util.cc
index 092a3e3a60..416cfb6344 100644
--- a/source/blender/alembic/intern/abc_util.cc
+++ b/source/blender/alembic/intern/abc_util.cc
@@ -252,7 +252,7 @@ void convert_matrix(const Imath::M44d &xform, Object *ob,
 
 /* Recompute transform matrix of object in new coordinate system
  * (from Z-Up to Y-Up). */
-void create_transform_matrix(Object *obj, float yup_mat[4][4])
+void create_transform_matrix(Object *obj, float r_yup_mat[4][4])
 {
 	float zup_mat[4][4];
 
@@ -271,7 +271,7 @@ void create_transform_matrix(Object *obj, float yup_mat[4][4])
 	}
 
 
-	copy_m44_axis_swap(yup_mat, zup_mat, ABC_YUP_FROM_ZUP);
+	copy_m44_axis_swap(r_yup_mat, zup_mat, ABC_YUP_FROM_ZUP);
 }
 
 bool has_property(const Alembic::Abc::ICompoundProperty &prop, const std::string &name)
diff --git a/source/blender/alembic/intern/abc_util.h b/source/blender/alembic/intern/abc_util.h
index a89c6637e4..e4a053fee0 100644
--- a/source/blender/alembic/intern/abc_util.h
+++ b/source/blender/alembic/intern/abc_util.h
@@ -52,7 +52,7 @@ bool object_selected(Object *ob);
 bool parent_selected(Object *ob);
 
 Imath::M44d convert_matrix(float mat[4][4]);
-void create_transform_matrix(Object *obj, float transform_mat[4][4]);
+void create_transform_matrix(Object *obj, float r_transform_mat[4][4]);
 
 void split(const std::string &s, const char delim, std::vector<std::string> &tokens);