diff options
| author | Andre Susano Pinto <andresusanopinto@gmail.com> | 2009-10-06 05:58:22 +0400 |
|---|---|---|
| committer | Andre Susano Pinto <andresusanopinto@gmail.com> | 2009-10-06 05:58:22 +0400 |
| commit | 63a88075b574e8f2f9adc041f423f49a7356d736 (patch) | |
| tree | 951f1f65d74d052debdafa14f6ad22750b6aad04 /source/gameengine/Expressions/Value.h | |
| parent | 11bdf6ea10ee7bc5e2862cdddbf42eddb06c42fa (diff) | |
| parent | 69a24325742c617a9902376b061006dfb24f0a3c (diff) | |
svn merge -r 23528:23646 https://svn.blender.org/svnroot/bf-blender/trunk/blendersoc-2009-jaguarandi
Diffstat (limited to 'source/gameengine/Expressions/Value.h')
| -rw-r--r-- | source/gameengine/Expressions/Value.h | 22 |
1 files changed, 5 insertions, 17 deletions
diff --git a/source/gameengine/Expressions/Value.h b/source/gameengine/Expressions/Value.h index 7d4adcdb64f..f639ae5af78 100644 --- a/source/gameengine/Expressions/Value.h +++ b/source/gameengine/Expressions/Value.h @@ -197,19 +197,14 @@ public: -#ifndef NO_EXP_PYTHON_EMBEDDING #include "PyObjectPlus.h" +#ifndef DISABLE_PYTHON #include "object.h" +#endif class CValue : public PyObjectPlus -#else -class CValue -#endif //NO_EXP_PYTHON_EMBEDDING - { -#ifndef NO_EXP_PYTHON_EMBEDDING Py_Header; -#endif //NO_EXP_PYTHON_EMBEDDING public: enum AllocationTYPE { STACKVALUE = 0, @@ -224,9 +219,9 @@ public: // Construction / Destruction -#ifndef NO_EXP_PYTHON_EMBEDDING - CValue(); + +#ifndef DISABLE_PYTHON //static PyObject* PyMake(PyObject*,PyObject*); virtual PyObject *py_repr(void) { @@ -242,10 +237,7 @@ public: static PyObject * pyattr_get_name(void * self, const KX_PYATTRIBUTE_DEF * attrdef); virtual PyObject* ConvertKeysToPython( void ); - -#else - CValue(); -#endif //NO_EXP_PYTHON_EMBEDDING +#endif // DISABLE_PYTHON @@ -416,12 +408,8 @@ public: \ class CPropValue : public CValue { public: -#ifndef NO_EXP_PYTHON_EMBEDDING CPropValue() : CValue(), -#else - CPropValue() : -#endif //NO_EXP_PYTHON_EMBEDDING m_strNewName() { |