diff options
author | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2012-03-03 05:43:44 +0400 |
---|---|---|
committer | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2012-03-03 05:43:44 +0400 |
commit | 9e93fc1e8acacb99b4b7638590ca4f1491e8b587 (patch) | |
tree | e42fb8ecc337a617a98e01f6c882b890ab9387e6 /source/gameengine/Expressions | |
parent | 00782aae1f5f3159c7afb1cb227bd8de1bc4b9c4 (diff) | |
parent | 95bba22af075148f9cbdb5a9b1ef41aeff1f560f (diff) |
Merged changes in the trunk up to revision 44612.
Conflicts resolved:
source/blender/blenloader/intern/readfile.c
source/blender/bmesh/bmesh.h
Diffstat (limited to 'source/gameengine/Expressions')
-rw-r--r-- | source/gameengine/Expressions/InputParser.cpp | 2 | ||||
-rw-r--r-- | source/gameengine/Expressions/ListValue.h | 2 | ||||
-rw-r--r-- | source/gameengine/Expressions/PyObjectPlus.cpp | 4 | ||||
-rw-r--r-- | source/gameengine/Expressions/Value.cpp | 2 | ||||
-rw-r--r-- | source/gameengine/Expressions/Value.h | 6 |
5 files changed, 8 insertions, 8 deletions
diff --git a/source/gameengine/Expressions/InputParser.cpp b/source/gameengine/Expressions/InputParser.cpp index 726fea795ba..9f0def6e866 100644 --- a/source/gameengine/Expressions/InputParser.cpp +++ b/source/gameengine/Expressions/InputParser.cpp @@ -581,7 +581,7 @@ CExpression* CParser::ProcessText ch = text[0]; /*if (ch != '=') { expr = new CConstExpr(new CStringValue(text)); - *dependant = deplist; + *dependent = deplist; return expr; } else */ diff --git a/source/gameengine/Expressions/ListValue.h b/source/gameengine/Expressions/ListValue.h index 26c11cccc7a..4446b40af16 100644 --- a/source/gameengine/Expressions/ListValue.h +++ b/source/gameengine/Expressions/ListValue.h @@ -34,7 +34,7 @@ public: void Configure(CValue* menuvalue); void Add(CValue* value); - /** @attention not implemented yet :( */ + /** \attention not implemented yet :( */ virtual CValue* Calc(VALUE_OPERATOR op,CValue *val); virtual CValue* CalcFinal(VALUE_DATA_TYPE dtype, VALUE_OPERATOR op, diff --git a/source/gameengine/Expressions/PyObjectPlus.cpp b/source/gameengine/Expressions/PyObjectPlus.cpp index d50ec0f414e..e772aec28e3 100644 --- a/source/gameengine/Expressions/PyObjectPlus.cpp +++ b/source/gameengine/Expressions/PyObjectPlus.cpp @@ -217,7 +217,7 @@ PyObject * PyObjectPlus::py_base_new(PyTypeObject *type, PyObject *args, PyObjec } /** - * @param self A PyObjectPlus_Proxy + * \param self A PyObjectPlus_Proxy */ void PyObjectPlus::py_base_dealloc(PyObject *self) // python wrapper { @@ -295,7 +295,7 @@ PyObject *PyObjectPlus::py_get_attrdef(PyObject *self_py, const PyAttributeDef * } if (attrdef->m_type == KX_PYATTRIBUTE_TYPE_FUNCTION) { - // the attribute has no field correspondance, handover processing to function. + // the attribute has no field correspondence, handover processing to function. if (attrdef->m_getFunction == NULL) return NULL; return (*attrdef->m_getFunction)(ptr, attrdef); diff --git a/source/gameengine/Expressions/Value.cpp b/source/gameengine/Expressions/Value.cpp index 49150fc775f..cc7c7f9b281 100644 --- a/source/gameengine/Expressions/Value.cpp +++ b/source/gameengine/Expressions/Value.cpp @@ -433,7 +433,7 @@ int CValue::GetPropertyCount() double* CValue::GetVector3(bool bGetTransformedVec) { - assertd(false); // don;t get vector from me + assertd(false); // don't get vector from me return m_sZeroVec;//::sZero; } diff --git a/source/gameengine/Expressions/Value.h b/source/gameengine/Expressions/Value.h index 917cf409198..3a81ec05d5b 100644 --- a/source/gameengine/Expressions/Value.h +++ b/source/gameengine/Expressions/Value.h @@ -181,7 +181,7 @@ public: * * Together with CExpression, CValue and it's derived classes can be used to * parse expressions into a parsetree with error detecting/correcting capabilities - * also expandible by a CFactory pluginsystem + * also expandable by a CFactory pluginsystem * * Base class for all editor functionality, flexible object type that allows * calculations and uses reference counting for memory management. @@ -316,7 +316,7 @@ public: virtual CValue* FindIdentifier(const STR_String& identifiername); /** Set the wireframe color of this value depending on the CSG * operator type <op> - * @attention: not implemented */ + * \attention: not implemented */ virtual void SetColorOperator(VALUE_OPERATOR op); virtual const STR_String & GetText() = 0; @@ -327,7 +327,7 @@ public: virtual STR_String& GetName() = 0; // Retrieve the name of the value virtual void SetName(const char *name) = 0; // Set the name of the value /** Sets the value to this cvalue. - * @attention this particular function should never be called. Why not abstract? */ + * \attention this particular function should never be called. Why not abstract? */ virtual void SetValue(CValue* newval); virtual CValue* GetReplica() =0; virtual void ProcessReplica(); |