code cleanup: move file string defines into BLI_path_utils.h, BKE_utildefines is now unused but keep incase we want to add defines there later.

4 files changed, 3 insertions, 5 deletions

diff --git a/source/blender/collada/DocumentExporter.cpp b/source/blender/collada/DocumentExporter.cpp
index c47798ee804..baaa6dbeed2 100644
--- a/source/blender/collada/DocumentExporter.cpp
+++ b/source/blender/collada/DocumentExporter.cpp
@@ -99,7 +99,6 @@ extern char build_rev[];
 #include "BKE_action.h" // pose functions
 #include "BKE_armature.h"
 #include "BKE_image.h"
-#include "BKE_utildefines.h"
 #include "BKE_object.h"
 
 #include "BLI_math.h"
diff --git a/source/blender/collada/DocumentImporter.cpp b/source/blender/collada/DocumentImporter.cpp
index e171cfecc23..f29933ea0c1 100644
--- a/source/blender/collada/DocumentImporter.cpp
+++ b/source/blender/collada/DocumentImporter.cpp
@@ -62,13 +62,13 @@ extern "C" {
 #include "BKE_texture.h"
 #include "BKE_fcurve.h"
 #include "BKE_depsgraph.h"
-#include "BLI_path_util.h"
 #include "BKE_scene.h"
 #include "BKE_global.h"
 #include "BKE_material.h"
-#include "BKE_utildefines.h"
 #include "BKE_image.h"
 
+#include "BLI_path_util.h"
+
 #include "DNA_camera_types.h"
 #include "DNA_lamp_types.h"
 
diff --git a/source/blender/collada/ImageExporter.cpp b/source/blender/collada/ImageExporter.cpp
index 66dcec7d8e4..ef714f2561f 100644
--- a/source/blender/collada/ImageExporter.cpp
+++ b/source/blender/collada/ImageExporter.cpp
@@ -39,7 +39,6 @@ extern "C" {
 #include "BKE_image.h"
 #include "BKE_main.h"
 #include "BKE_mesh.h"
-#include "BKE_utildefines.h"
 #include "BLI_fileops.h"
 #include "BLI_path_util.h"
 #include "BLI_string.h"
diff --git a/source/blender/collada/MeshImporter.cpp b/source/blender/collada/MeshImporter.cpp
index 5593fe993f4..cf211e2fbb1 100644
--- a/source/blender/collada/MeshImporter.cpp
+++ b/source/blender/collada/MeshImporter.cpp
@@ -570,7 +570,7 @@ void MeshImporter::read_lines(COLLADAFW::Mesh *mesh, Mesh *me)
 	if (loose_edge_count > 0) {
 
 		unsigned int face_edge_count  = me->totedge;
-		unsigned int total_edge_count = loose_edge_count + face_edge_count;
+		/* unsigned int total_edge_count = loose_edge_count + face_edge_count; */ /* UNUSED */
 		
 		mesh_add_edges(me, loose_edge_count);
 		MEdge *med = me->medge + face_edge_count;