From 047c66279ae7f7447e5fd1cbd5baba225e8cfe84 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Sun, 20 Oct 2019 16:42:49 +1100 Subject: Cleanup: missing declaration warnings --- source/blender/collada/BlenderContext.cpp | 2 ++ source/blender/collada/collada_internal.cpp | 2 +- source/blender/collada/collada_utils.cpp | 10 +++++----- 3 files changed, 8 insertions(+), 6 deletions(-) (limited to 'source/blender/collada') 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 #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> &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, ""); } -- cgit v1.2.3