Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergey Sharybin <sergey.vfx@gmail.com>2014-08-11 18:58:42 +0400
committerSergey Sharybin <sergey.vfx@gmail.com>2014-08-11 18:58:42 +0400
commit3e41c8ad6fd194c567471b39b88fddccc599a946 (patch)
tree32ca99d6bf6d28e01c7b14252ddbbdd73b862826 /source/blender/blenkernel/intern/idprop.c
parent0fe70b5e2871bd82d868614548fd62d81f1873c3 (diff)
Fix compilation error with debug scons
The issue is that we've got hell with DEBUG and _DEBUG, theu're defined really inconsistent acros CMake and SCons. Used more reliable NDEBUG definition for IDP_spit.
Diffstat (limited to 'source/blender/blenkernel/intern/idprop.c')
-rw-r--r--source/blender/blenkernel/intern/idprop.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/blenkernel/intern/idprop.c b/source/blender/blenkernel/intern/idprop.c
index 95bfd72c9df..fa949bf2f79 100644
--- a/source/blender/blenkernel/intern/idprop.c
+++ b/source/blender/blenkernel/intern/idprop.c
@@ -821,7 +821,7 @@ bool IDP_EqualsProperties_ex(IDProperty *prop1, IDProperty *prop2, const bool is
case IDP_INT:
return (IDP_Int(prop1) == IDP_Int(prop2));
case IDP_FLOAT:
-#if defined(DEBUG) && defined(WITH_PYTHON)
+#if !defined(NDEBUG) && defined(WITH_PYTHON)
{
float p1 = IDP_Float(prop1);
float p2 = IDP_Float(prop2);