[Bf-blender-cvs] [e7a8f353551] collada: Cleanup: Fixed '#ifndef xxx' brakets in hjeader files

Gaia Clary noreply at git.blender.org
Wed Mar 28 21:31:03 CEST 2018


Commit: e7a8f3535519b9bdd375c96c3dce26cd831ca1ab
Author: Gaia Clary
Date:   Fri Mar 23 15:42:37 2018 +0100
Branches: collada
https://developer.blender.org/rBe7a8f3535519b9bdd375c96c3dce26cd831ca1ab

Cleanup: Fixed '#ifndef xxx' brakets in hjeader files

Due to renaming classes and files the initial #ifndef brakets
have got possibly misleading values for xxx

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

M	source/blender/collada/AnimationExporter.h
M	source/blender/collada/BCAnimationCurve.h
M	source/blender/collada/BCSampleData.h

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

diff --git a/source/blender/collada/AnimationExporter.h b/source/blender/collada/AnimationExporter.h
index 3ddbcc97d27..f94a9a172a8 100644
--- a/source/blender/collada/AnimationExporter.h
+++ b/source/blender/collada/AnimationExporter.h
@@ -20,8 +20,8 @@
  * ***** END GPL LICENSE BLOCK *****
  */
 
-#ifndef __ANIMATION_EXPORTER_H__
-#define __ANIMATION_EXPORTER_H__
+#ifndef __BC_ANIMATION_EXPORTER_H__
+#define __BC_ANIMATION_EXPORTER_H__
 
 #include <stdlib.h>
 #include <stdio.h>
diff --git a/source/blender/collada/BCAnimationCurve.h b/source/blender/collada/BCAnimationCurve.h
index 779a86b9419..a8144d56470 100644
--- a/source/blender/collada/BCAnimationCurve.h
+++ b/source/blender/collada/BCAnimationCurve.h
@@ -23,8 +23,8 @@
 * ***** END GPL LICENSE BLOCK *****
 */
 
-#ifndef __BCANIMATION_CURVE_H__
-#define __BCANIMATION_CURVE_H__
+#ifndef __BC_ANIMATION_CURVE_H__
+#define __BC_ANIMATION_CURVE_H__
 
 #include "collada_utils.h"
 #include "BCSampleData.h"
diff --git a/source/blender/collada/BCSampleData.h b/source/blender/collada/BCSampleData.h
index ad10055a38d..3e49996d845 100644
--- a/source/blender/collada/BCSampleData.h
+++ b/source/blender/collada/BCSampleData.h
@@ -23,8 +23,9 @@
 * ***** END GPL LICENSE BLOCK *****
 */
 
-#ifndef __BC_MATRIX_H__
-#define __BC_MATRIX_H__
+#ifndef __BC_SAMPLE_H__
+#define __BC_SAMPLE_H__
+
 
 class BCSample {
 private:



More information about the Bf-blender-cvs mailing list