diff options
author | Joerg Mueller <nexyon@gmail.com> | 2011-07-12 17:09:22 +0400 |
---|---|---|
committer | Joerg Mueller <nexyon@gmail.com> | 2011-07-12 17:09:22 +0400 |
commit | d9cf98573050fa10f586ed121f514986e688e609 (patch) | |
tree | 6916742b8cb0b67387198592414d52860bf000cf /source/gameengine/Expressions | |
parent | 9132754dc1ed77429a6e870c479b69ac8829d845 (diff) | |
parent | b90535cc334bb8ae3a51f8023732b8c786019ac7 (diff) |
Merging trunk up to r38329.
Diffstat (limited to 'source/gameengine/Expressions')
-rw-r--r-- | source/gameengine/Expressions/PyObjectPlus.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/gameengine/Expressions/PyObjectPlus.cpp b/source/gameengine/Expressions/PyObjectPlus.cpp index 10906cdae02..3a25df73f9b 100644 --- a/source/gameengine/Expressions/PyObjectPlus.cpp +++ b/source/gameengine/Expressions/PyObjectPlus.cpp @@ -1147,7 +1147,7 @@ PyObject *PyObjectPlus::NewProxyPlus_Ext(PyObjectPlus *self, PyTypeObject *tp, v BGE_PROXY_REF(proxy) = NULL; BGE_PROXY_PTR(proxy) = ptr; #ifdef USE_WEAKREFS - BGE_PROXY_WKREF(self->m_proxy) = NULL; + BGE_PROXY_WKREF(proxy) = NULL; #endif return proxy; } |