[Bf-blender-cvs] [3f9035bd5d0] usd-importer-T81257: Fixed compiler warning.

Michael A. Kowalski noreply at git.blender.org
Sat Dec 5 02:23:16 CET 2020


Commit: 3f9035bd5d0cd6dd0d62c439e3c875fd14f94bb0
Author: Michael A. Kowalski
Date:   Fri Dec 4 20:20:15 2020 -0500
Branches: usd-importer-T81257
https://developer.blender.org/rB3f9035bd5d0cd6dd0d62c439e3c875fd14f94bb0

Fixed compiler warning.

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

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

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

diff --git a/source/blender/io/usd/import/usd_material_importer.cc b/source/blender/io/usd/import/usd_material_importer.cc
index 68f3c26fd33..6d671eb77ed 100644
--- a/source/blender/io/usd/import/usd_material_importer.cc
+++ b/source/blender/io/usd/import/usd_material_importer.cc
@@ -339,28 +339,27 @@ void USDMaterialImporter::set_node_input(const pxr::UsdShadeInput &usd_input,
     switch (sock->type) {
       case SOCK_FLOAT:
         if (val.IsHolding<float>()) {
-          float fval = val.Get<float>();
-          ((bNodeSocketValueFloat *)sock->default_value)->value = fval;
+          ((bNodeSocketValueFloat *)sock->default_value)->value = val.UncheckedGet<float>();
         }
         else if (val.IsHolding<pxr::GfVec3f>()) {
-          pxr::GfVec3f v3f = val.Get<pxr::GfVec3f>();
+          pxr::GfVec3f v3f = val.UncheckedGet<pxr::GfVec3f>();
           float average = (v3f[0] + v3f[1] + v3f[2]) / 3.0f;
           ((bNodeSocketValueFloat *)sock->default_value)->value = average;
         }
         break;
       case SOCK_RGBA:
         if (val.IsHolding<pxr::GfVec3f>()) {
-          pxr::GfVec3f v3f = val.Get<pxr::GfVec3f>();
+          pxr::GfVec3f v3f = val.UncheckedGet<pxr::GfVec3f>();
           copy_v3_v3(((bNodeSocketValueRGBA *)sock->default_value)->value, v3f.data());
         }
         break;
       case SOCK_VECTOR:
         if (val.IsHolding<pxr::GfVec3f>()) {
-          pxr::GfVec3f v3f = val.Get<pxr::GfVec3f>();
+          pxr::GfVec3f v3f = val.UncheckedGet<pxr::GfVec3f>();
           copy_v3_v3(((bNodeSocketValueVector *)sock->default_value)->value, v3f.data());
         }
         else if (val.IsHolding<pxr::GfVec2f>()) {
-          pxr::GfVec2f v2f = val.Get<pxr::GfVec2f>();
+          pxr::GfVec2f v2f = val.UncheckedGet<pxr::GfVec2f>();
           copy_v2_v2(((bNodeSocketValueVector *)sock->default_value)->value, v2f.data());
         }
         break;



More information about the Bf-blender-cvs mailing list