projects
/
platform
/
upstream
/
assimp.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
8b2f108
)
Blender: fix compiler warning: FAIL already defined.
author
Kim Kulling
<kim.kulling@googlemail.com>
Sun, 30 Oct 2016 18:21:38 +0000
(19:21 +0100)
committer
Kim Kulling
<kim.kulling@googlemail.com>
Sun, 30 Oct 2016 18:21:38 +0000
(19:21 +0100)
code/BlenderScene.h
patch
|
blob
|
history
diff --git
a/code/BlenderScene.h
b/code/BlenderScene.h
index
4f4ed81
..
04eb4bc
100644
(file)
--- a/
code/BlenderScene.h
+++ b/
code/BlenderScene.h
@@
-91,8
+91,17
@@
namespace Blender {
// value for the field.
//
-#define WARN // warn if field is missing, substitute default value
-#define FAIL // fail the import if the field does not exist
+// warn if field is missing, substitute default value
+#ifdef WARN
+# undef WARN
+#endif
+#define WARN
+
+// fail the import if the field does not exist
+#ifdef FAIL
+# undef FAIL
+#endif
+#define FAIL
struct Object;
struct MTex;