Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSybren A. Stüvel <sybren@stuvel.eu>2017-03-02 12:05:34 +0300
committerSybren A. Stüvel <sybren@stuvel.eu>2017-04-06 17:47:00 +0300
commit6c37a53a2e6a9c619e19d36dbf073c9cc6b3d665 (patch)
tree1746a88d9a804cb76f379a1e9dc49a84619d542e /source/blender/alembic
parent5e86144cd3a75042a3691ad3c9a920a451df38b6 (diff)
Alembic import: prevented unnecessary vector scaling
Diffstat (limited to 'source/blender/alembic')
-rw-r--r--source/blender/alembic/intern/abc_object.cc2
1 files changed, 1 insertions, 1 deletions
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();