Merge branch 'master' into asset-uuid--archivedasset-uuid--archived

1 files changed, 11 insertions, 4 deletions

diff --git a/source/blender/io/alembic/intern/abc_axis_conversion.cc b/source/blender/io/alembic/intern/abc_axis_conversion.cc
index 17db5e9c99f..cebab1f2e41 100644
--- a/source/blender/io/alembic/intern/abc_axis_conversion.cc
+++ b/source/blender/io/alembic/intern/abc_axis_conversion.cc
@@ -20,12 +20,14 @@
 
 #include "abc_axis_conversion.h"
 
-extern "C" {
 #include "BLI_assert.h"
+#include "BLI_math_geom.h"
+
 #include "DNA_object_types.h"
 
-#include "BLI_math_geom.h"
-}
+namespace blender {
+namespace io {
+namespace alembic {
 
 void create_swapped_rotation_matrix(float rot_x_mat[3][3],
                                     float rot_y_mat[3][3],
@@ -72,7 +74,8 @@ void create_swapped_rotation_matrix(float rot_x_mat[3][3],
   rot_z_mat[1][0] = -sin(rz);
   rot_z_mat[0][1] = sin(rz);
   rot_z_mat[1][1] = cos(rz);
-}
+}  // namespace
+   // alembicvoidcreate_swapped_rotation_matrix(floatrot_x_mat[3][3],floatrot_y_mat[3][3],floatrot_z_mat[3][3],constfloateuler[3],AbcAxisSwapModemode)
 
 /* Convert matrix from Z=up to Y=up or vice versa.
  * Use yup_mat = zup_mat for in-place conversion. */
@@ -164,3 +167,7 @@ void create_transform_matrix(Object *obj,
 
   copy_m44_axis_swap(r_yup_mat, zup_mat, ABC_YUP_FROM_ZUP);
 }
+
+}  // namespace alembic
+}  // namespace io
+}  // namespace blender
\ No newline at end of file