[Bf-blender-cvs] [e9f9e0f913] temp-sybren-alembic: FIXUP code style

Sybren A. Stüvel noreply at git.blender.org
Wed Mar 1 15:15:56 CET 2017


Commit: e9f9e0f913e674cf00015e70310c6fdb1bfefd6e
Author: Sybren A. Stüvel
Date:   Wed Mar 1 14:27:25 2017 +0100
Branches: temp-sybren-alembic
https://developer.blender.org/rBe9f9e0f913e674cf00015e70310c6fdb1bfefd6e

FIXUP code style

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

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

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

diff --git a/source/blender/alembic/intern/abc_object.cc b/source/blender/alembic/intern/abc_object.cc
index b8152dec7f..88c4fc91ea 100644
--- a/source/blender/alembic/intern/abc_object.cc
+++ b/source/blender/alembic/intern/abc_object.cc
@@ -236,7 +236,6 @@ void AbcObjectReader::setupObjectTransform(const float time)
 	}
 }
 
-
 Alembic::AbcGeom::IXform AbcObjectReader::xform()
 {
 	/* Check that we have an empty object (locator, bone head/tail...).  */
@@ -263,7 +262,6 @@ Alembic::AbcGeom::IXform AbcObjectReader::xform()
 	return IXform();
 }
 
-
 void AbcObjectReader::read_matrix(float mat[4][4], const float time, const float scale, bool &is_constant)
 {
 	IXform ixform = xform();
diff --git a/source/blender/alembic/intern/abc_util.cc b/source/blender/alembic/intern/abc_util.cc
index 49c806125c..092a3e3a60 100644
--- a/source/blender/alembic/intern/abc_util.cc
+++ b/source/blender/alembic/intern/abc_util.cc
@@ -204,14 +204,14 @@ void copy_m44_axis_swap(float dst_mat[4][4], float src_mat[4][4], AbcAxisSwapMod
 
 	/* Apply translation */
 	switch(mode) {
-	case ABC_ZUP_FROM_YUP:
-		copy_zup_from_yup(dst_mat[3], src_trans);
-		break;
-	case ABC_YUP_FROM_ZUP:
-		copy_yup_from_zup(dst_mat[3], src_trans);
-		break;
-	default:
-		BLI_assert(false);
+		case ABC_ZUP_FROM_YUP:
+			copy_zup_from_yup(dst_mat[3], src_trans);
+			break;
+		case ABC_YUP_FROM_ZUP:
+			copy_yup_from_zup(dst_mat[3], src_trans);
+			break;
+		default:
+			BLI_assert(false);
 	}
 
 	/* Apply scale matrix. Swaps y and z, but does not




More information about the Bf-blender-cvs mailing list