[Bf-blender-cvs] [cbf56b59160] temp-gpu-image-engine: Merge branch 'master' into temp-gpu-image-engine

[Jeroen Bakker]

Commit: cbf56b59160cf12e0e9fc9d2083b27e578bd3048
Author: Jeroen Bakker
Date:   Fri Dec 10 09:31:42 2021 +0100
Branches: temp-gpu-image-engine
https://developer.blender.org/rBcbf56b59160cf12e0e9fc9d2083b27e578bd3048

Merge branch 'master' into temp-gpu-image-engine

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



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

diff --cc source/blender/blenlib/BLI_math_matrix.h
index 78bd8371aa7,4beb2508937..a3592b6ca5f
--- a/source/blender/blenlib/BLI_math_matrix.h
+++ b/source/blender/blenlib/BLI_math_matrix.h
@@@ -312,8 -397,12 +397,13 @@@ void invert_m4_m4_safe_ortho(float Ainv
  
  void scale_m3_fl(float R[3][3], float scale);
  void scale_m4_fl(float R[4][4], float scale);
 +void scale_m4_v2(float R[4][4], const float scale[2]);
  
+ /**
+  * This computes the overall volume scale factor of a transformation matrix.
+  * For an orthogonal matrix, it is the product of all three scale values.
+  * Returns a negative value if the transform is flipped by negative scale.
+  */
  float mat3_to_volume_scale(const float M[3][3]);
  float mat4_to_volume_scale(const float M[4][4]);