530396289a
It was difficult to notice, but we weren't making use of the `USDPrimReader::valid()` API calls during import. In many(all?) cases this was fine as we would check the validity during `read_object_data` or similar anyhow. Rather than just removing the API entirely, this patch attempts to use it and has the following design: - Where ever and whenever a reader is created, in addition to checking null, we should now also check for `valid()` This happens in `usd_capi_import` and `usd_reader_stage`. - The `valid()` call is intended to check just the USD object status. Blender object checks are handled elsewhere (same as they are currently) since these objects are often not available at the time of the call to `valid()` This has the benefit that we at least know that USD is valid before our heavy reading code ever starts executing. Some duplicate checks are now removed. Pull Request: https://projects.blender.org/blender/blender/pulls/129181
48 lines
1.0 KiB
C++
48 lines
1.0 KiB
C++
/* SPDX-FileCopyrightText: 2023 NVIDIA Corporation. All rights reserved.
|
|
*
|
|
* SPDX-License-Identifier: GPL-2.0-or-later */
|
|
#pragma once
|
|
|
|
#include "usd_reader_xform.hh"
|
|
|
|
struct Collection;
|
|
struct Main;
|
|
|
|
namespace blender::io::usd {
|
|
|
|
/**
|
|
* Convert a USD instanced prim to a blender collection instance.
|
|
*/
|
|
class USDInstanceReader : public USDXformReader {
|
|
|
|
public:
|
|
USDInstanceReader(const pxr::UsdPrim &prim,
|
|
const USDImportParams &import_params,
|
|
const ImportSettings &settings)
|
|
: USDXformReader(prim, import_params, settings)
|
|
{
|
|
}
|
|
|
|
bool valid() const override
|
|
{
|
|
return prim_.IsValid() && prim_.IsInstance();
|
|
}
|
|
|
|
/**
|
|
* Create an object that instances a collection.
|
|
*/
|
|
void create_object(Main *bmain, double motionSampleTime) override;
|
|
|
|
/**
|
|
* Assign the given collection to the object.
|
|
*/
|
|
void set_instance_collection(Collection *coll);
|
|
|
|
/**
|
|
* Get the path of the USD prototype prim.
|
|
*/
|
|
pxr::SdfPath proto_path() const;
|
|
};
|
|
|
|
} // namespace blender::io::usd
|