diff options
| author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2018-03-10 08:55:39 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2018-03-10 08:55:39 +0300 |
| commit | d27158aae9bc48b2a07760a2dbe8e642fcecbe57 (patch) | |
| tree | 7ecfe898e53f07e589ee4be0ea5b297153d7dfcf /intern/cycles/app | |
| parent | f3161bd2abe4bcc41f0e9169275be315ecc6b054 (diff) | |
| parent | 8a76f8dac3475b1d24956e0d384d65295f15c76a (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'intern/cycles/app')
| -rw-r--r-- | intern/cycles/app/cycles_xml.cpp | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/intern/cycles/app/cycles_xml.cpp b/intern/cycles/app/cycles_xml.cpp index 21ae07e23b8..a46955322e3 100644 --- a/intern/cycles/app/cycles_xml.cpp +++ b/intern/cycles/app/cycles_xml.cpp @@ -40,6 +40,7 @@ #include "util/util_foreach.h" #include "util/util_path.h" +#include "util/util_projection.h" #include "util/util_transform.h" #include "util/util_xml.h" @@ -546,8 +547,10 @@ static void xml_read_transform(xml_node node, Transform& tfm) { if(node.attribute("matrix")) { vector<float> matrix; - if(xml_read_float_array(matrix, node, "matrix") && matrix.size() == 16) - tfm = tfm * transform_transpose((*(Transform*)&matrix[0])); + if(xml_read_float_array(matrix, node, "matrix") && matrix.size() == 16) { + ProjectionTransform projection = *(ProjectionTransform*)&matrix[0]; + tfm = tfm * projection_to_transform(projection_transpose(projection)); + } } if(node.attribute("translate")) { |