[Bf-blender-cvs] [6ca64058b37] usd-importer-T81257: USD importer xform bug fix.

[Michael A. Kowalski]

Commit: 6ca64058b3719a357c15386bc8b55436f8467f86
Author: Michael A. Kowalski
Date:   Thu Oct 15 18:08:29 2020 -0400
Branches: usd-importer-T81257
https://developer.blender.org/rB6ca64058b3719a357c15386bc8b55436f8467f86

USD importer xform bug fix.

Fixed matrix multiplication order when computing
local transform for merged objects.

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

M	source/blender/io/usd/import/usd_reader_object.cc

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

diff --git a/source/blender/io/usd/import/usd_reader_object.cc b/source/blender/io/usd/import/usd_reader_object.cc
index 19e77a08484..55eb0328acb 100644
--- a/source/blender/io/usd/import/usd_reader_object.cc
+++ b/source/blender/io/usd/import/usd_reader_object.cc
@@ -141,7 +141,7 @@ void UsdObjectReader::read_matrix(float r_mat[4][4] /* local matrix */,
       pxr::GfMatrix4d usd_parent_local_xf;
       parent_xformable.GetLocalTransformation(&usd_parent_local_xf, &reset_xform_stack, time);
 
-      usd_local_xf = usd_parent_local_xf * usd_local_xf;
+      usd_local_xf = usd_local_xf * usd_parent_local_xf;
     }
   }