svn merge ^/trunk/blender -r44189:44204

8 files changed, 17 insertions, 17 deletions

diff --git a/source/blender/collada/AnimationImporter.h b/source/blender/collada/AnimationImporter.h
index 2c3165db122..118a50b0480 100644
--- a/source/blender/collada/AnimationImporter.h
+++ b/source/blender/collada/AnimationImporter.h
@@ -24,8 +24,8 @@
  *  \ingroup collada
  */
 
-#ifndef __BC_ANIMATIONIMPORTER_H__
-#define __BC_ANIMATIONIMPORTER_H__
+#ifndef __ANIMATIONIMPORTER_H__
+#define __ANIMATIONIMPORTER_H__
 
 #include <map>
 #include <vector>
diff --git a/source/blender/collada/ArmatureImporter.h b/source/blender/collada/ArmatureImporter.h
index 343badaca28..0c95ee81272 100644
--- a/source/blender/collada/ArmatureImporter.h
+++ b/source/blender/collada/ArmatureImporter.h
@@ -24,8 +24,8 @@
  *  \ingroup collada
  */
 
-#ifndef __BC_ARMATUREIMPORTER_H__
-#define __BC_ARMATUREIMPORTER_H__
+#ifndef __ARMATUREIMPORTER_H__
+#define __ARMATUREIMPORTER_H__
 
 #include "COLLADAFWNode.h"
 #include "COLLADAFWUniqueId.h"
diff --git a/source/blender/collada/MeshImporter.h b/source/blender/collada/MeshImporter.h
index 3bccc4ed04a..0c2e600121f 100644
--- a/source/blender/collada/MeshImporter.h
+++ b/source/blender/collada/MeshImporter.h
@@ -24,8 +24,8 @@
  *  \ingroup collada
  */
 
-#ifndef __BC__MESHIMPORTER_H__
-#define __BC__MESHIMPORTER_H__
+#ifndef __MESHIMPORTER_H__
+#define __MESHIMPORTER_H__
 
 #include <map>
 #include <vector>
diff --git a/source/blender/collada/SkinInfo.h b/source/blender/collada/SkinInfo.h
index 71b7c71fd90..7befe7168d3 100644
--- a/source/blender/collada/SkinInfo.h
+++ b/source/blender/collada/SkinInfo.h
@@ -24,8 +24,8 @@
  *  \ingroup collada
  */
 
-#ifndef __BC_SKININFO_H__
-#define __BC_SKININFO_H__
+#ifndef __SKININFO_H__
+#define __SKININFO_H__
 
 #include <map>
 #include <vector>
diff --git a/source/blender/collada/TransformReader.h b/source/blender/collada/TransformReader.h
index e1409a9ced8..a08f4438d73 100644
--- a/source/blender/collada/TransformReader.h
+++ b/source/blender/collada/TransformReader.h
@@ -24,8 +24,8 @@
  *  \ingroup collada
  */
 
-#ifndef __BC_TRANSFORMREADER_H__
-#define __BC_TRANSFORMREADER_H__
+#ifndef __TRANSFORMREADER_H__
+#define __TRANSFORMREADER_H__
 
 #include "COLLADAFWNode.h"
 #include "COLLADAFWTransformation.h"
diff --git a/source/blender/collada/collada.h b/source/blender/collada/collada.h
index 161977368db..f8afc797447 100644
--- a/source/blender/collada/collada.h
+++ b/source/blender/collada/collada.h
@@ -24,8 +24,8 @@
  *  \ingroup collada
  */
 
-#ifndef BLENDER_COLLADA_H
-#define BLENDER_COLLADA_H
+#ifndef __COLLADA_H__
+#define __COLLADA_H__
 
 struct bContext;
 struct Scene;
diff --git a/source/blender/collada/collada_internal.h b/source/blender/collada/collada_internal.h
index 5c3aa49b837..4f555acb882 100644
--- a/source/blender/collada/collada_internal.h
+++ b/source/blender/collada/collada_internal.h
@@ -24,8 +24,8 @@
  *  \ingroup collada
  */
 
-#ifndef COLLADA_INTERNAL_H
-#define COLLADA_INTERNAL_H
+#ifndef __COLLADA_INTERNAL_H__
+#define __COLLADA_INTERNAL_H__
 
 #include <string>
 #include <vector>
@@ -98,4 +98,4 @@ extern std::string get_material_id(Material *mat);
 
 extern bool has_object_type(Scene* sce, short obtype);
 
-#endif /* COLLADA_INTERNAL_H */
+#endif /* __COLLADA_INTERNAL_H__ */
diff --git a/source/blender/collada/collada_utils.h b/source/blender/collada/collada_utils.h
index b95e3bd2824..b0c24152652 100644
--- a/source/blender/collada/collada_utils.h
+++ b/source/blender/collada/collada_utils.h
@@ -24,8 +24,8 @@
  *  \ingroup collada
  */
 
-#ifndef __BC_UTILS_H__
-#define __BC_UTILS_H__
+#ifndef __COLLADA_UTILS_H__
+#define __COLLADA_UTILS_H__
 
 #include "COLLADAFWMeshPrimitive.h"
 #include "COLLADAFWGeometry.h"