[Bf-blender-cvs] [386c19f7712] usd-importer-T81257-merge: USD Import: Fix USDGeomReader casts.

makowalski noreply at git.blender.org
Thu Apr 15 19:25:16 CEST 2021


Commit: 386c19f7712cb71d6d1d16f070c7ec46464d3f1f
Author: makowalski
Date:   Thu Apr 15 13:17:03 2021 -0400
Branches: usd-importer-T81257-merge
https://developer.blender.org/rB386c19f7712cb71d6d1d16f070c7ec46464d3f1f

USD Import: Fix USDGeomReader casts.

Changed reinterpret_cast() to dynamic_cast() when
casting from USDPrimReader to USDGeomReader in mesh
sequence cache modifier callbacks.

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

M	source/blender/io/usd/intern/usd_capi_import.cc

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

diff --git a/source/blender/io/usd/intern/usd_capi_import.cc b/source/blender/io/usd/intern/usd_capi_import.cc
index 1400c655979..52773ac6a67 100644
--- a/source/blender/io/usd/intern/usd_capi_import.cc
+++ b/source/blender/io/usd/intern/usd_capi_import.cc
@@ -623,8 +623,8 @@ Mesh *USD_read_mesh(CacheReader *reader,
                     int read_flag,
                     float vel_fac)
 {
-  USDGeomReader *usd_reader = reinterpret_cast<USDGeomReader *>(
-      get_usd_reader(reader, ob, err_str));
+  USDGeomReader *usd_reader = dynamic_cast<USDGeomReader *>(get_usd_reader(reader, ob, err_str));
+
   if (usd_reader == NULL) {
     return NULL;
   }
@@ -635,7 +635,7 @@ Mesh *USD_read_mesh(CacheReader *reader,
 bool USD_mesh_topology_changed(
     CacheReader *reader, Object *ob, Mesh *existing_mesh, const float time, const char **err_str)
 {
-  USDMeshReader *usd_reader = (USDMeshReader *)get_usd_reader(reader, ob, err_str);
+  USDGeomReader *usd_reader = dynamic_cast<USDGeomReader *>(get_usd_reader(reader, ob, err_str));
 
   if (usd_reader == NULL) {
     return false;



More information about the Bf-blender-cvs mailing list