From fcac614ad09b455784b3f7968859b770e72cd243 Mon Sep 17 00:00:00 2001 From: Kim Kulling Date: Sun, 30 Oct 2016 19:21:38 +0100 Subject: [PATCH] Blender: fix compiler warning: FAIL already defined. --- code/BlenderScene.h | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/code/BlenderScene.h b/code/BlenderScene.h index 4f4ed81cc..04eb4bcad 100644 --- 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;