Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSybren A. Stüvel <sybren@stuvel.eu>2017-03-02 11:56:57 +0300
committerSybren A. Stüvel <sybren@stuvel.eu>2017-04-06 17:47:00 +0300
commit8b2555e7987afe41de4ec0b6da3c8738f8e2f857 (patch)
treea62e7270539070fbc33a830f446e5eb36afed818 /source/blender/alembic/intern/abc_util.cc
parentf226b808ffb59ddb9aac8e51fff794f81bb55e38 (diff)
Alembic: added some r_ prefixes for return parameters
Diffstat (limited to 'source/blender/alembic/intern/abc_util.cc')
-rw-r--r--source/blender/alembic/intern/abc_util.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/alembic/intern/abc_util.cc b/source/blender/alembic/intern/abc_util.cc
index 45aa0510dfe..4ec949fce3c 100644
--- a/source/blender/alembic/intern/abc_util.cc
+++ b/source/blender/alembic/intern/abc_util.cc
@@ -254,7 +254,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];
@@ -273,7 +273,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)