[Bf-blender-cvs] [6c37a53a2e6] master: Alembic import: prevented unnecessary vector scaling

[Sybren A. Stüvel]

Commit: 6c37a53a2e6a9c619e19d36dbf073c9cc6b3d665
Author: Sybren A. Stüvel
Date:   Thu Mar 2 10:05:34 2017 +0100
Branches: master
https://developer.blender.org/rB6c37a53a2e6a9c619e19d36dbf073c9cc6b3d665

Alembic import: prevented unnecessary vector scaling

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

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

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

diff --git a/source/blender/alembic/intern/abc_object.cc b/source/blender/alembic/intern/abc_object.cc
index 2c658716c3a..9afca0f0988 100644
--- a/source/blender/alembic/intern/abc_object.cc
+++ b/source/blender/alembic/intern/abc_object.cc
@@ -304,8 +304,8 @@ void AbcObjectReader::read_matrix(float r_mat[4][4], const float time,
 		/* Only apply scaling to root objects, parenting will propagate it. */
 		float scale_mat[4][4];
 		scale_m4_fl(scale_mat, scale);
+		scale_mat[3][3] = scale; /* scale translations too */
 		mul_m4_m4m4(r_mat, r_mat, scale_mat);
-		mul_v3_fl(r_mat[3], scale);
 	}
 
 	is_constant = schema.isConstant();