Commit: b2ad97ba97f3e55d1dd463e29ca0b2ec6fe761e1 Author: Michael Kowalski Date: Fri Sep 23 16:56:14 2022 -0400 Branches: tmp-usd-alab-v2-T100452 https://developer.blender.org/rBb2ad97ba97f3e55d1dd463e29ca0b2ec6fe761e1
Merge branch 'master' into tmp-usd-alab-v2-T100452 =================================================================== =================================================================== diff --cc source/blender/editors/io/io_usd.c index fd8caf6836e,eb80cabcd7f..1496eac0027 --- a/source/blender/editors/io/io_usd.c +++ b/source/blender/editors/io/io_usd.c @@@ -451,9 -427,10 +451,11 @@@ static int wm_usd_import_exec(bContext .import_usd_preview = import_usd_preview, .set_material_blend = set_material_blend, .light_intensity_scale = light_intensity_scale, - .mtl_name_collision_mode = mtl_name_collision_mode}; + .mtl_name_collision_mode = mtl_name_collision_mode, + .mtl_purpose = mtl_purpose}; + STRNCPY(params.prim_path_mask, prim_path_mask); + const bool ok = USD_import(C, filename, ¶ms, as_background_job); return as_background_job || ok ? OPERATOR_FINISHED : OPERATOR_CANCELLED; _______________________________________________ Bf-blender-cvs mailing list Bf-blender-cvs@blender.org List details, subscription details or unsubscribe: https://lists.blender.org/mailman/listinfo/bf-blender-cvs