[Bf-blender-cvs] [359af53c355] cycles_procedural_api: fix rotation priority order in matrix axis swapping

[Kévin Dietrich]

Commit: 359af53c35526f47421cb1c7ca6936153a94b6cd
Author: Kévin Dietrich
Date:   Sun Dec 6 04:50:44 2020 +0100
Branches: cycles_procedural_api
https://developer.blender.org/rB359af53c35526f47421cb1c7ca6936153a94b6cd

fix rotation priority order in matrix axis swapping

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

M	intern/cycles/render/alembic.cpp

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

diff --git a/intern/cycles/render/alembic.cpp b/intern/cycles/render/alembic.cpp
index 6d119d7f6b8..b9289e6eb66 100644
--- a/intern/cycles/render/alembic.cpp
+++ b/intern/cycles/render/alembic.cpp
@@ -46,7 +46,7 @@ static float3 make_float3_from_yup(const V3f &v)
 static M44d convert_yup_zup(const M44d &mtx)
 {
   V3d scale, shear, rotation, translation;
-  extractSHRT(mtx, scale, shear, rotation, translation);
+  extractSHRT(mtx, scale, shear, rotation, translation, true, IMATH_INTERNAL_NAMESPACE::Euler<double>::XZY);
 
   M44d rot_mat, scale_mat, trans_mat;
   rot_mat.setEulerAngles(V3d(rotation.x, -rotation.z, rotation.y));