Merge branch 'blender-v2.81-release'

8 files changed, 19 insertions, 10 deletions

diff --git a/source/blender/collada/BlenderContext.cpp b/source/blender/collada/BlenderContext.cpp
index 8735d71ec40..a9783a9b9c4 100644
--- a/source/blender/collada/BlenderContext.cpp
+++ b/source/blender/collada/BlenderContext.cpp
@@ -21,6 +21,8 @@
 #include <vector>
 
 #include "BlenderContext.h"
+#include "ExportSettings.h"
+
 #include "BKE_scene.h"
 
 bool bc_is_base_node(LinkNode *export_set, Object *ob, ViewLayer *view_layer)
diff --git a/source/blender/collada/collada_internal.cpp b/source/blender/collada/collada_internal.cpp
index a97b5e0eca1..7e834045795 100644
--- a/source/blender/collada/collada_internal.cpp
+++ b/source/blender/collada/collada_internal.cpp
@@ -314,7 +314,7 @@ std::string get_joint_sid(Bone *bone)
 {
   return translate_id(bone->name);
 }
-std::string get_joint_sid(EditBone *bone)
+static std::string get_joint_sid(EditBone *bone)
 {
   return translate_id(bone->name);
 }
diff --git a/source/blender/collada/collada_utils.cpp b/source/blender/collada/collada_utils.cpp
index dd5611c4bef..b688840cb09 100644
--- a/source/blender/collada/collada_utils.cpp
+++ b/source/blender/collada/collada_utils.cpp
@@ -1149,7 +1149,7 @@ void bc_copy_m4d_v44(double (&r)[4][4], std::vector<std::vector<double>> &a)
 /**
  * Returns name of Active UV Layer or empty String if no active UV Layer defined
  */
-std::string bc_get_active_uvlayer_name(Mesh *me)
+static std::string bc_get_active_uvlayer_name(Mesh *me)
 {
   int num_layers = CustomData_number_of_layers(&me->ldata, CD_MLOOPUV);
   if (num_layers) {
@@ -1165,7 +1165,7 @@ std::string bc_get_active_uvlayer_name(Mesh *me)
  * Returns name of Active UV Layer or empty String if no active UV Layer defined.
  * Assuming the Object is of type MESH
  */
-std::string bc_get_active_uvlayer_name(Object *ob)
+static std::string bc_get_active_uvlayer_name(Object *ob)
 {
   Mesh *me = (Mesh *)ob->data;
   return bc_get_active_uvlayer_name(me);
@@ -1174,7 +1174,7 @@ std::string bc_get_active_uvlayer_name(Object *ob)
 /**
  * Returns UV Layer name or empty string if layer index is out of range
  */
-std::string bc_get_uvlayer_name(Mesh *me, int layer)
+static std::string bc_get_uvlayer_name(Mesh *me, int layer)
 {
   int num_layers = CustomData_number_of_layers(&me->ldata, CD_MLOOPUV);
   if (num_layers && layer < num_layers) {
@@ -1206,7 +1206,7 @@ static bNodeTree *prepare_material_nodetree(Material *ma)
   return ma->nodetree;
 }
 
-bNode *bc_add_node(
+static bNode *bc_add_node(
     bContext *C, bNodeTree *ntree, int node_type, int locx, int locy, std::string label)
 {
   bNode *node = nodeAddStaticNode(C, ntree, node_type);
@@ -1221,7 +1221,7 @@ bNode *bc_add_node(
   return node;
 }
 
-bNode *bc_add_node(bContext *C, bNodeTree *ntree, int node_type, int locx, int locy)
+static bNode *bc_add_node(bContext *C, bNodeTree *ntree, int node_type, int locx, int locy)
 {
   return bc_add_node(C, ntree, node_type, locx, locy, "");
 }
diff --git a/tests/gtests/blenlib/BLI_kdopbvh_test.cc b/tests/gtests/blenlib/BLI_kdopbvh_test.cc
index bd35a491550..ac0d477ee14 100644
--- a/tests/gtests/blenlib/BLI_kdopbvh_test.cc
+++ b/tests/gtests/blenlib/BLI_kdopbvh_test.cc
@@ -50,7 +50,7 @@ TEST(kdopbvh, Single)
   BLI_bvhtree_free(tree);
 }
 
-void optimal_check_callback(void *userdata, int index, const float co[3], BVHTreeNearest *nearest)
+static void optimal_check_callback(void *userdata, int index, const float co[3], BVHTreeNearest *nearest)
 {
   float(*points)[3] = (float(*)[3])userdata;
 
diff --git a/tests/gtests/blenlib/BLI_map_test.cc b/tests/gtests/blenlib/BLI_map_test.cc
index 61e7a603d13..e91f809abba 100644
--- a/tests/gtests/blenlib/BLI_map_test.cc
+++ b/tests/gtests/blenlib/BLI_map_test.cc
@@ -156,7 +156,7 @@ TEST(map, ItemIterator)
   EXPECT_TRUE(values.contains(0.0f));
 }
 
-float return_42()
+static float return_42()
 {
   return 42.0f;
 }
diff --git a/tests/gtests/blenlib/BLI_string_test.cc b/tests/gtests/blenlib/BLI_string_test.cc
index d69cb519494..257f478622f 100644
--- a/tests/gtests/blenlib/BLI_string_test.cc
+++ b/tests/gtests/blenlib/BLI_string_test.cc
@@ -453,7 +453,7 @@ struct WordInfo {
   }
   int start, end;
 };
-std::ostream &operator<<(std::ostream &os, const WordInfo &word_info)
+static std::ostream &operator<<(std::ostream &os, const WordInfo &word_info)
 {
   os << "start: " << word_info.start << ", end: " << word_info.end;
   return os;
diff --git a/tests/gtests/blenlib/BLI_vector_test.cc b/tests/gtests/blenlib/BLI_vector_test.cc
index 9486c9c0ef2..f258e50a60c 100644
--- a/tests/gtests/blenlib/BLI_vector_test.cc
+++ b/tests/gtests/blenlib/BLI_vector_test.cc
@@ -261,7 +261,7 @@ TEST(vector, BecomeLarge)
   }
 }
 
-IntVector return_by_value_helper()
+static IntVector return_by_value_helper()
 {
   return IntVector({3, 5, 1});
 }
diff --git a/tests/gtests/blenlib/stubs/bf_intern_eigen_stubs.h b/tests/gtests/blenlib/stubs/bf_intern_eigen_stubs.h
index 97c0916dd9b..dec2631fc63 100644
--- a/tests/gtests/blenlib/stubs/bf_intern_eigen_stubs.h
+++ b/tests/gtests/blenlib/stubs/bf_intern_eigen_stubs.h
@@ -2,6 +2,13 @@
 
 extern "C" {
 
+void EIG_svd_square_matrix(
+    const int size, const float *matrix, float *r_U, float *r_S, float *r_V);
+bool EIG_self_adjoint_eigen_solve(const int size,
+                                  const float *matrix,
+                                  float *r_eigen_values,
+                                  float *r_eigen_vectors);
+
 bool EIG_self_adjoint_eigen_solve(const int size,
                                   const float *matrix,
                                   float *r_eigen_values,