[Bf-blender-cvs] [0dece50667f] master: Fix T65717: Alembic (camera - also mesh) import scale issue

[Sybren A. Stüvel]

Commit: 0dece50667f1c8bc4d2a1fb73f3d4eaa287922df
Author: Sybren A. Stüvel
Date:   Thu Jul 18 15:39:50 2019 +0200
Branches: master
https://developer.blender.org/rB0dece50667f1c8bc4d2a1fb73f3d4eaa287922df

Fix T65717: Alembic (camera - also mesh) import scale issue

The w-component of the translation column of the scaled matrix wasn't
set to 1.0, which, apart from being incorrect, caused drawing problems.

Reviewed By: brecht

Differential Revision: https://developer.blender.org/D5290

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

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 54450ce1cb2..7b0d94a2305 100644
--- a/source/blender/alembic/intern/abc_object.cc
+++ b/source/blender/alembic/intern/abc_object.cc
@@ -343,8 +343,7 @@ void AbcObjectReader::read_matrix(float r_mat[4][4],
     /* 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_m4_m4m4(r_mat, scale_mat, r_mat);
   }
 
   is_constant = schema.isConstant();