[Bf-blender-cvs] [a65832c23cf] usd-importer-T81257-merge: USD Import: simplify conditional logic.

[makowalski]

Commit: a65832c23cfa906d42f5bf6a6a7134d3d6927720
Author: makowalski
Date:   Thu Apr 15 15:44:37 2021 -0400
Branches: usd-importer-T81257-merge
https://developer.blender.org/rBa65832c23cfa906d42f5bf6a6a7134d3d6927720

USD Import: simplify conditional logic.

Simplified conditional statement with early return.

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

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

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

diff --git a/source/blender/io/usd/intern/usd_reader_stage.cc b/source/blender/io/usd/intern/usd_reader_stage.cc
index 5b0d2224fa0..6daa4eeb75f 100644
--- a/source/blender/io/usd/intern/usd_reader_stage.cc
+++ b/source/blender/io/usd/intern/usd_reader_stage.cc
@@ -129,16 +129,17 @@ USDPrimReader *USDStageReader::create_reader(const USDStageReader *archive,
 static bool _prune_by_visibility(const pxr::UsdGeomImageable &imageable,
                                  const USDImportParams &params)
 {
-  if (imageable && params.import_visible_only) {
-    if (pxr::UsdAttribute visibility_attr = imageable.GetVisibilityAttr()) {
-
-      // Prune if the prim has a non-animating visibility attribute and is
-      // invisible.
-      if (!visibility_attr.ValueMightBeTimeVarying()) {
-        pxr::TfToken visibility;
-        visibility_attr.Get(&visibility);
-        return visibility == pxr::UsdGeomTokens->invisible;
-      }
+  if (!(imageable && params.import_visible_only)) {
+    return false;
+  }
+
+  if (pxr::UsdAttribute visibility_attr = imageable.GetVisibilityAttr()) {
+    // Prune if the prim has a non-animating visibility attribute and is
+    // invisible.
+    if (!visibility_attr.ValueMightBeTimeVarying()) {
+      pxr::TfToken visibility;
+      visibility_attr.Get(&visibility);
+      return visibility == pxr::UsdGeomTokens->invisible;
     }
   }