[Bf-blender-cvs] [6f7959f55fd] master: Merge branch 'blender-v3.2-release'

[Aras Pranckevicius]

Commit: 6f7959f55fd2b3d291f63f0601d179bf581c5b28
Author: Aras Pranckevicius
Date:   Tue May 10 18:59:46 2022 +0300
Branches: master
https://developer.blender.org/rB6f7959f55fd2b3d291f63f0601d179bf581c5b28

Merge branch 'blender-v3.2-release'

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



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

diff --cc source/blender/io/common/CMakeLists.txt
index 02bd5b2b81f,b5766b44025..95ffbe19ada
--- a/source/blender/io/common/CMakeLists.txt
+++ b/source/blender/io/common/CMakeLists.txt
@@@ -7,6 -7,8 +7,8 @@@ set(IN
    ../../blenlib
    ../../depsgraph
    ../../makesdna
+   ../../../../intern/guardedalloc
 -  ../../../../extern/fast_float
++
  )
  
  set(INC_SYS
@@@ -17,9 -19,14 +19,12 @@@ set(SR
    intern/dupli_parent_finder.cc
    intern/dupli_persistent_id.cc
    intern/object_identifier.cc
+   intern/path_util.cc
 -  intern/string_utils.cc
  
    IO_abstract_hierarchy_iterator.h
    IO_dupli_persistent_id.hh
+   IO_path_util.hh
+   IO_path_util_types.h
 -  IO_string_utils.hh
    IO_types.h
    intern/dupli_parent_finder.hh
  )