[Bf-blender-cvs] [15de129] alembic_basic_io: Use regular include guards
Campbell Barton
noreply at git.blender.org
Thu Jul 21 00:21:53 CEST 2016
Commit: 15de129e937640dbda07a66a59185901a96c3c75
Author: Campbell Barton
Date: Thu Jul 21 08:26:35 2016 +1000
Branches: alembic_basic_io
https://developer.blender.org/rB15de129e937640dbda07a66a59185901a96c3c75
Use regular include guards
===================================================================
M source/blender/alembic/intern/abc_camera.h
M source/blender/alembic/intern/abc_curves.h
M source/blender/alembic/intern/abc_customdata.h
M source/blender/alembic/intern/abc_exporter.h
M source/blender/alembic/intern/abc_hair.h
M source/blender/alembic/intern/abc_mesh.h
M source/blender/alembic/intern/abc_nurbs.h
M source/blender/alembic/intern/abc_object.h
M source/blender/alembic/intern/abc_points.h
M source/blender/alembic/intern/abc_transform.h
M source/blender/alembic/intern/abc_util.h
===================================================================
diff --git a/source/blender/alembic/intern/abc_camera.h b/source/blender/alembic/intern/abc_camera.h
index 7ffda7f..fafb4d3 100644
--- a/source/blender/alembic/intern/abc_camera.h
+++ b/source/blender/alembic/intern/abc_camera.h
@@ -20,7 +20,8 @@
* ***** END GPL LICENSE BLOCK *****
*/
-#pragma once
+#ifndef __ABC_CAMERA_H__
+#define __ABC_CAMERA_H__
#include "abc_object.h"
@@ -56,3 +57,5 @@ public:
void readObjectData(Main *bmain, float time);
};
+
+#endif /* __ABC_CAMERA_H__ */
\ No newline at end of file
diff --git a/source/blender/alembic/intern/abc_curves.h b/source/blender/alembic/intern/abc_curves.h
index 2d039b2..ee47f19 100644
--- a/source/blender/alembic/intern/abc_curves.h
+++ b/source/blender/alembic/intern/abc_curves.h
@@ -22,7 +22,8 @@
*
*/
-#pragma once
+#ifndef __ABC_CURVES_H__
+#define __ABC_CURVES_H__
#include "abc_object.h"
@@ -60,3 +61,5 @@ public:
/* ************************************************************************** */
void read_curve_sample(Curve *cu, const Alembic::AbcGeom::ICurvesSchema &schema, const float time);
+
+#endif /* __ABC_CURVES_H__ */
\ No newline at end of file
diff --git a/source/blender/alembic/intern/abc_customdata.h b/source/blender/alembic/intern/abc_customdata.h
index b6aa7b6..3b16c0d 100644
--- a/source/blender/alembic/intern/abc_customdata.h
+++ b/source/blender/alembic/intern/abc_customdata.h
@@ -22,7 +22,8 @@
*
*/
-#pragma once
+#ifndef __ABC_CUSTOMDATA_H__
+#define __ABC_CUSTOMDATA_H__
#include <Alembic/Abc/All.h>
@@ -88,3 +89,5 @@ void write_custom_data(const OCompoundProperty &prop,
void read_custom_data(const ICompoundProperty &prop,
const CDStreamConfig &config,
const Alembic::Abc::ISampleSelector &iss);
+
+#endif /* __ABC_CUSTOMDATA_H__ */
diff --git a/source/blender/alembic/intern/abc_exporter.h b/source/blender/alembic/intern/abc_exporter.h
index 828c858..2b5fb94 100644
--- a/source/blender/alembic/intern/abc_exporter.h
+++ b/source/blender/alembic/intern/abc_exporter.h
@@ -20,7 +20,8 @@
* ***** END GPL LICENSE BLOCK *****
*/
-#pragma once
+#ifndef __ABC_EXPORTER_H__
+#define __ABC_EXPORTER_H__
#include <Alembic/Abc/All.h>
#include <map>
@@ -107,3 +108,5 @@ private:
void setCurrentFrame(Main *bmain, double t);
};
+
+#endif /* __ABC_EXPORTER_H__ */
diff --git a/source/blender/alembic/intern/abc_hair.h b/source/blender/alembic/intern/abc_hair.h
index 36584c8..d132b60 100644
--- a/source/blender/alembic/intern/abc_hair.h
+++ b/source/blender/alembic/intern/abc_hair.h
@@ -20,7 +20,8 @@
* ***** END GPL LICENSE BLOCK *****
*/
-#pragma once
+#ifndef __ABC_HAIR_H__
+#define __ABC_HAIR_H__
#include "abc_object.h"
@@ -61,3 +62,5 @@ private:
std::vector<Imath::V2f> &uv_values,
std::vector<int32_t> &hvertices);
};
+
+#endif /* __ABC_HAIR_H__ */
diff --git a/source/blender/alembic/intern/abc_mesh.h b/source/blender/alembic/intern/abc_mesh.h
index 4219f75..fc629c2 100644
--- a/source/blender/alembic/intern/abc_mesh.h
+++ b/source/blender/alembic/intern/abc_mesh.h
@@ -20,7 +20,8 @@
* ***** END GPL LICENSE BLOCK *****
*/
-#pragma once
+#ifndef __ABC_MESH_H__
+#define __ABC_MESH_H__
#include "abc_customdata.h"
#include "abc_object.h"
@@ -145,3 +146,5 @@ void mesh_add_verts(struct Mesh *mesh, size_t len);
void read_mverts(MVert *mverts,
const Alembic::AbcGeom::P3fArraySamplePtr &positions,
const Alembic::AbcGeom::N3fArraySamplePtr &normals);
+
+#endif /* __ABC_MESH_H__ */
\ No newline at end of file
diff --git a/source/blender/alembic/intern/abc_nurbs.h b/source/blender/alembic/intern/abc_nurbs.h
index 553e15b..1b2e7a8 100644
--- a/source/blender/alembic/intern/abc_nurbs.h
+++ b/source/blender/alembic/intern/abc_nurbs.h
@@ -20,7 +20,8 @@
* ***** END GPL LICENSE BLOCK *****
*/
-#pragma once
+#ifndef __ABC_NURBS_H__
+#define __ABC_NURBS_H__
#include "abc_object.h"
@@ -58,3 +59,5 @@ public:
private:
void getNurbsPatches(const Alembic::Abc::IObject &obj);
};
+
+#endif /* __ABC_NURBS_H__ */
diff --git a/source/blender/alembic/intern/abc_object.h b/source/blender/alembic/intern/abc_object.h
index aa8e440..f665254 100644
--- a/source/blender/alembic/intern/abc_object.h
+++ b/source/blender/alembic/intern/abc_object.h
@@ -20,7 +20,8 @@
* ***** END GPL LICENSE BLOCK *****
*/
-#pragma once
+#ifndef __ABC_OBJECT_H__
+#define __ABC_OBJECT_H__
#include <Alembic/Abc/All.h>
#include <Alembic/AbcGeom/All.h>
@@ -169,3 +170,5 @@ public:
chrono_t minTime() const;
chrono_t maxTime() const;
};
+
+#endif /* __ABC_OBJECT_H__ */
diff --git a/source/blender/alembic/intern/abc_points.h b/source/blender/alembic/intern/abc_points.h
index bb3880f..f044956 100644
--- a/source/blender/alembic/intern/abc_points.h
+++ b/source/blender/alembic/intern/abc_points.h
@@ -22,7 +22,8 @@
*
*/
-#pragma once
+#ifndef __ABC_POINTS_H__
+#define __ABC_POINTS_H__
#include "abc_object.h"
@@ -59,3 +60,5 @@ public:
void readObjectData(Main *bmain, float time);
};
+
+#endif /* __ABC_POINTS_H__ */
diff --git a/source/blender/alembic/intern/abc_transform.h b/source/blender/alembic/intern/abc_transform.h
index ca0e187..6a3aae2 100644
--- a/source/blender/alembic/intern/abc_transform.h
+++ b/source/blender/alembic/intern/abc_transform.h
@@ -20,7 +20,8 @@
* ***** END GPL LICENSE BLOCK *****
*/
-#pragma once
+#ifndef __ABC_TRANSFORM_H__
+#define __ABC_TRANSFORM_H__
#include "abc_object.h"
@@ -68,3 +69,5 @@ public:
void readObjectData(Main *bmain, float time);
};
+
+#endif /* __ABC_TRANSFORM_H__ */
diff --git a/source/blender/alembic/intern/abc_util.h b/source/blender/alembic/intern/abc_util.h
index 0409f28..688a25d 100644
--- a/source/blender/alembic/intern/abc_util.h
+++ b/source/blender/alembic/intern/abc_util.h
@@ -20,7 +20,8 @@
* ***** END GPL LICENSE BLOCK *****
*/
-#pragma once
+#ifndef __ABC_UTIL_H__
+#define __ABC_UTIL_H__
#include <Alembic/Abc/All.h>
#include <Alembic/AbcGeom/All.h>
@@ -120,3 +121,5 @@ ABC_INLINE void copy_zup_yup(short yup[3], const short zup[3])
yup[1] = zup[2];
yup[2] = -zup[1];
}
+
+#endif /* __ABC_UTIL_H__ */
More information about the Bf-blender-cvs
mailing list