diff options
| author | Sybren A. Stüvel <sybren@stuvel.eu> | 2017-03-02 12:03:51 +0300 |
|---|---|---|
| committer | Sybren A. Stüvel <sybren@stuvel.eu> | 2017-04-06 17:47:00 +0300 |
| commit | 5e86144cd3a75042a3691ad3c9a920a451df38b6 (patch) | |
| tree | 998a62e011f7048524a6b060fd438a34b83a1f94 /source/blender/alembic/intern/abc_util.h | |
| parent | 4cb5114e136f4ab2b12fe130dba3dff55031a9c8 (diff) | |
Alembic import: moved import-time scaling to different function
convert_matrix() now only converts from Imath::M44d to float[4][4] (taking
different camera orientations into account). Import-time scaling is now
performed by the caller.
Diffstat (limited to 'source/blender/alembic/intern/abc_util.h')
| -rw-r--r-- | source/blender/alembic/intern/abc_util.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/source/blender/alembic/intern/abc_util.h b/source/blender/alembic/intern/abc_util.h index 486d9384dee..92d2fcae7a9 100644 --- a/source/blender/alembic/intern/abc_util.h +++ b/source/blender/alembic/intern/abc_util.h @@ -63,8 +63,7 @@ bool begins_with(const TContainer &input, const TContainer &match) && std::equal(match.begin(), match.end(), input.begin()); } -void convert_matrix(const Imath::M44d &xform, Object *ob, - float r_mat[4][4], float scale, bool has_alembic_parent = false); +void convert_matrix(const Imath::M44d &xform, Object *ob, float r_mat[4][4]); template <typename Schema> void get_min_max_time_ex(const Schema &schema, chrono_t &min, chrono_t &max) |