[Bf-blender-cvs] [f34814a3e0] temp-sybren-alembic: FIXUP: float -> short in copy_yup_from_zup

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


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

FIXUP: float -> short in copy_yup_from_zup

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

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

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

diff --git a/source/blender/alembic/intern/abc_util.h b/source/blender/alembic/intern/abc_util.h
index 4a5561b47a..a89c6637e4 100644
--- a/source/blender/alembic/intern/abc_util.h
+++ b/source/blender/alembic/intern/abc_util.h
@@ -125,7 +125,7 @@ ABC_INLINE void copy_zup_from_yup(float zup[3], const float yup[3])
 
 ABC_INLINE void copy_zup_from_yup(short zup[3], const short yup[3])
 {
-	const float old_yup1 = yup[1];  /* in case zup == yup */
+	const short old_yup1 = yup[1];  /* in case zup == yup */
 	zup[0] = yup[0];
 	zup[1] = -yup[2];
 	zup[2] = old_yup1;
@@ -143,7 +143,7 @@ ABC_INLINE void copy_yup_from_zup(float yup[3], const float zup[3])
 
 ABC_INLINE void copy_yup_from_zup(short yup[3], const short zup[3])
 {
-	const float old_zup1 = zup[1];  /* in case yup == zup */
+	const short old_zup1 = zup[1];  /* in case yup == zup */
 	yup[0] = zup[0];
 	yup[1] = zup[2];
 	yup[2] = -old_zup1;




More information about the Bf-blender-cvs mailing list