griefith/test
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Cleanup: USD, pass object & mesh as const to USD_mesh_topology_changed

Browse Source 
Make the `Object *` and `Mesh *` parameter of `USD_mesh_topology_changed()`
`const`. This function only inspects them, and doesn't need to modify
them.

No functional changes.
This commit is contained in:
Sybren A. Stüvel
2022-12-08 10:48:04 +01:00
parent 3780a40265
commit 96e1684a9d
2 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
source/blender/io/usd/intern/usd_capi_import.cc
View File

@@ -450,7 +450,9 @@ bool USD_import(struct bContext *C,
* USD reader is compatible with the type of the given (currently unused) 'ob'
* Object parameter, similar to the logic in get_abc_reader() in the
* Alembic importer code. */
static USDPrimReader *get_usd_reader(CacheReader *reader, Object * /* ob */, const char **err_str)
static USDPrimReader *get_usd_reader(CacheReader *reader,
const Object * /* ob */,
const char **err_str)
{
USDPrimReader *usd_reader = reinterpret_cast<USDPrimReader *>(reader);
pxr::UsdPrim iobject = usd_reader->prim();
@@ -479,8 +481,11 @@ struct Mesh *USD_read_mesh(struct CacheReader *reader,
return usd_reader->read_mesh(existing_mesh, time, read_flag, err_str);
}
bool USD_mesh_topology_changed(
CacheReader *reader, Object *ob, Mesh *existing_mesh, const double time, const char **err_str)
bool USD_mesh_topology_changed(CacheReader *reader,
const Object *ob,
const Mesh *existing_mesh,
const double time,
const char **err_str)
{
USDGeomReader *usd_reader = dynamic_cast<USDGeomReader *>(get_usd_reader(reader, ob, err_str));

4
source/blender/io/usd/usd.h
View File

@@ -107,8 +107,8 @@ struct Mesh *USD_read_mesh(struct CacheReader *reader,
int read_flag);
bool USD_mesh_topology_changed(struct CacheReader *reader,
struct Object *ob,
struct Mesh *existing_mesh,
const struct Object *ob,
const struct Mesh *existing_mesh,
double time,
const char **err_str);