[Bf-blender-cvs] [ccddbec1681] soc-2021-simulation-display: Merge branch 'master' into soc-2021-simulation-display

[Your Name]

Commit: ccddbec16812c05cecef2dfee60e8238a537a627
Author: Your Name
Date:   Wed Dec 1 12:22:06 2021 +0530
Branches: soc-2021-simulation-display
https://developer.blender.org/rBccddbec16812c05cecef2dfee60e8238a537a627

Merge branch 'master' into soc-2021-simulation-display

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



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

diff --cc intern/libmv/third_party/msinttypes/inttypes.h
index eae057851f6,0e8af69cb07..010cfc46ad1
--- a/intern/libmv/third_party/msinttypes/inttypes.h
+++ b/intern/libmv/third_party/msinttypes/inttypes.h
@@@ -29,21 -26,21 +26,21 @@@
  // WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
  // OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
  // ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- //
+ // 
  ///////////////////////////////////////////////////////////////////////////////
  
 -#ifndef _MSC_VER // [
 -#error "Use this header only with Microsoft Visual C++ compilers!"
 -#endif // _MSC_VER ]
 +#ifndef _MSC_VER  // [
 +#  error "Use this header only with Microsoft Visual C++ compilers!"
 +#endif  // _MSC_VER ]
  
 -#ifndef _MSC_INTTYPES_H_ // [
 -#define _MSC_INTTYPES_H_
 +#ifndef _MSC_INTTYPES_H_  // [
 +#  define _MSC_INTTYPES_H_
  
 -#if _MSC_VER > 1000
 -#pragma once
 -#endif
 +#  if _MSC_VER > 1000
 +#    pragma once
 +#  endif
  
 -#include <stdint.h>
 +#  include <stdint.h>
  
  // 7.8 Format conversion of integer types
  
diff --cc intern/libmv/third_party/msinttypes/stdint.h
index cc9bcd1f443,189ee34571c..db6507147d3
--- a/intern/libmv/third_party/msinttypes/stdint.h
+++ b/intern/libmv/third_party/msinttypes/stdint.h
@@@ -29,21 -26,21 +26,21 @@@
  // WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
  // OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
  // ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- //
+ // 
  ///////////////////////////////////////////////////////////////////////////////
  
 -#ifndef _MSC_VER // [
 -#error "Use this header only with Microsoft Visual C++ compilers!"
 -#endif // _MSC_VER ]
 +#ifndef _MSC_VER  // [
 +#  error "Use this header only with Microsoft Visual C++ compilers!"
 +#endif  // _MSC_VER ]
  
 -#ifndef _MSC_STDINT_H_ // [
 -#define _MSC_STDINT_H_
 +#ifndef _MSC_STDINT_H_  // [
 +#  define _MSC_STDINT_H_
  
 -#if _MSC_VER > 1000
 -#pragma once
 -#endif
 +#  if _MSC_VER > 1000
 +#    pragma once
 +#  endif
  
 -#include <limits.h>
 +#  include <limits.h>
  
  // For Visual Studio 6 in C++ mode and for many Visual Studio versions when
  // compiling for ARM we should wrap <wchar.h> include with 'extern "C++" {}'