[Bf-blender-cvs] [d173583576f] temp-usd-udim-import: Merge remote-tracking branch 'origin/master' into temp-T90535-usd-alab-material-import

[Michael Kowalski]

Commit: d173583576f5bb1ebf9986af1e1a86e4db819ac7
Author: Michael Kowalski
Date:   Wed Jan 5 17:10:53 2022 -0500
Branches: temp-usd-udim-import
https://developer.blender.org/rBd173583576f5bb1ebf9986af1e1a86e4db819ac7

Merge remote-tracking branch 'origin/master' into temp-T90535-usd-alab-material-import

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



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

diff --cc source/blender/io/usd/intern/usd_reader_material.cc
index 6f5747ba2f8,645dea42971..38a1614a96d
--- a/source/blender/io/usd/intern/usd_reader_material.cc
+++ b/source/blender/io/usd/intern/usd_reader_material.cc
@@@ -23,12 -23,10 +23,13 @@@
  #include "BKE_main.h"
  #include "BKE_material.h"
  #include "BKE_node.h"
+ #include "BKE_node_tree_update.h"
  
 +#include "BLI_fileops.h"
  #include "BLI_math_vector.h"
 +#include "BLI_path_util.h"
  #include "BLI_string.h"
 +#include "BLI_vector.hh"
  
  #include "DNA_material_types.h"