diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2014-08-11 18:58:42 +0400 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2014-08-11 18:58:42 +0400 |
| commit | 3e41c8ad6fd194c567471b39b88fddccc599a946 (patch) | |
| tree | 32ca99d6bf6d28e01c7b14252ddbbdd73b862826 /source | |
| parent | 0fe70b5e2871bd82d868614548fd62d81f1873c3 (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')
| -rw-r--r-- | source/blender/blenkernel/BKE_idprop.h | 2 | ||||
| -rw-r--r-- | source/blender/blenkernel/intern/idprop.c | 2 | ||||
| -rw-r--r-- | source/blender/python/generic/idprop_py_api.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/blenkernel/BKE_idprop.h b/source/blender/blenkernel/BKE_idprop.h index 0230eaf92bc..2ab3d84dea5 100644 --- a/source/blender/blenkernel/BKE_idprop.h +++ b/source/blender/blenkernel/BKE_idprop.h @@ -143,7 +143,7 @@ void IDP_UnlinkProperty(struct IDProperty *prop); # define IDP_IDPArray(prop) ((IDProperty *) (prop)->data.pointer) #endif -#ifdef DEBUG +#ifndef NDEBUG /* for printout only */ void IDP_spit(IDProperty *prop); #endif 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); diff --git a/source/blender/python/generic/idprop_py_api.c b/source/blender/python/generic/idprop_py_api.c index dcdda2c440e..8c9e84af8ed 100644 --- a/source/blender/python/generic/idprop_py_api.c +++ b/source/blender/python/generic/idprop_py_api.c @@ -1541,7 +1541,7 @@ PyObject *BPyInit_idprop(void) } -#ifdef DEBUG +#ifndef NDEBUG /* -------------------------------------------------------------------- */ /* debug only function */ |