[Bf-blender-cvs] [48eef11eb09] tmp-dynamic-usd: Merge branch 'universal-scene-description' into tmp-dynamic-usd

[Michael Kowalski]

Commit: 48eef11eb09d355bd8064a4875a93264848a43fd
Author: Michael Kowalski
Date:   Wed Dec 7 14:36:08 2022 -0500
Branches: tmp-dynamic-usd
https://developer.blender.org/rB48eef11eb09d355bd8064a4875a93264848a43fd

Merge branch 'universal-scene-description' into tmp-dynamic-usd

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



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

diff --cc source/blender/editors/io/io_usd.c
index 7c873463790,e82aefc4383..3f9390813f9
--- a/source/blender/editors/io/io_usd.c
+++ b/source/blender/editors/io/io_usd.c
@@@ -1170,11 -1150,9 +1172,12 @@@ static int wm_usd_import_exec(bContext 
                                     .mtl_name_collision_mode = mtl_name_collision_mode,
                                     .attr_import_mode = attr_import_mode,
                                     .import_shapes = import_shapes,
 +                                   .import_textures = import_textures,
-                                    .overwrite_textures = overwrite_textures};
++                                   .overwrite_textures = overwrite_textures,
+                                    .import_defined_only = import_defined_only};
  
    STRNCPY(params.prim_path_mask, prim_path_mask);
 +  STRNCPY(params.import_textures_dir, import_textures_dir);
  
    const bool ok = USD_import(C, filename, &params, as_background_job);
  
diff --cc source/blender/io/usd/usd.h
index 6b729d5dfb5,e62cf965424..e3f9dbf6bbe
--- a/source/blender/io/usd/usd.h
+++ b/source/blender/io/usd/usd.h
@@@ -176,9 -176,7 +176,10 @@@ struct USDImportParams 
    eUSDAttrImportMode attr_import_mode;
    bool triangulate_meshes;
    bool import_shapes;
 +  bool import_textures;
 +  char import_textures_dir[1024];
 +  bool overwrite_textures;
+   bool import_defined_only;
  };
  
  /* The USD_export takes a as_background_job parameter, and returns a boolean.