[Bf-blender-cvs] [6d5ab8f] master: Cleanup: collada had own defined Global (why?)

[Campbell Barton]

Commit: 6d5ab8fdb7414e0619b87cacfc33d5fc8ff5bdc2
Author: Campbell Barton
Date:   Tue Mar 3 14:49:43 2015 +1100
Branches: master
https://developer.blender.org/rB6d5ab8fdb7414e0619b87cacfc33d5fc8ff5bdc2

Cleanup: collada had own defined Global (why?)

Wasn't needed and made linking fail here

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

M	source/blender/collada/AnimationExporter.cpp
M	source/blender/collada/AnimationExporter.h

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

diff --git a/source/blender/collada/AnimationExporter.cpp b/source/blender/collada/AnimationExporter.cpp
index 9077db5..de4e29a 100644
--- a/source/blender/collada/AnimationExporter.cpp
+++ b/source/blender/collada/AnimationExporter.cpp
@@ -24,8 +24,6 @@
 #include "AnimationExporter.h"
 #include "MaterialExporter.h"
 
-Global G;
-
 template<class Functor>
 void forEachObjectInExportSet(Scene *sce, Functor &f, LinkNode *export_set)
 {
diff --git a/source/blender/collada/AnimationExporter.h b/source/blender/collada/AnimationExporter.h
index 5e7338a..6f675ed 100644
--- a/source/blender/collada/AnimationExporter.h
+++ b/source/blender/collada/AnimationExporter.h
@@ -51,7 +51,6 @@ extern "C"
 #include "BKE_object.h"
 #include "BKE_constraint.h"
 #include "BIK_api.h"
-#include "BKE_global.h"
 #include "ED_object.h"
 }