diff options
Diffstat (limited to 'source/blender/io/usd/usd.h')
| -rw-r--r-- | source/blender/io/usd/usd.h | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/source/blender/io/usd/usd.h b/source/blender/io/usd/usd.h index 2e4dcb0da94..a07315d8b4e 100644 --- a/source/blender/io/usd/usd.h +++ b/source/blender/io/usd/usd.h @@ -15,6 +15,13 @@ struct CacheReader; struct Object; struct bContext; +/* Behavior when the name of an imported material + * conflicts with an existing material. */ +typedef enum eUSDMtlNameCollisionMode { + USD_MTL_NAME_COLLISION_MAKE_UNIQUE = 0, + USD_MTL_NAME_COLLISION_REFERENCE_EXISTING = 1, +} eUSDMtlNameCollisionMode; + struct USDExportParams { bool export_animation; bool export_hair; @@ -57,6 +64,7 @@ struct USDImportParams { bool import_usd_preview; bool set_material_blend; float light_intensity_scale; + eUSDMtlNameCollisionMode mtl_name_collision_mode; }; /* The USD_export takes a as_background_job parameter, and returns a boolean. |