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:
authorCampbell Barton <ideasman42@gmail.com>2013-03-26 11:29:01 +0400
committerCampbell Barton <ideasman42@gmail.com>2013-03-26 11:29:01 +0400
commit64d161de87c82094ce8ea63bc69aded59f7f588d (patch)
tree933a100be152419309c2d01e0874f9f3981828d1 /source/gameengine/Expressions
parentef961319e077fb97cde958fd61845afcc775c67c (diff)
style cleanup:
also rename mesh_getVertexCos() --> BKE_mesh_vertexCos_get() to match curve function.
Diffstat (limited to 'source/gameengine/Expressions')
-rw-r--r--source/gameengine/Expressions/EmptyValue.cpp4
-rw-r--r--source/gameengine/Expressions/KX_HashedPtr.cpp2
-rw-r--r--source/gameengine/Expressions/KX_HashedPtr.h2
-rw-r--r--source/gameengine/Expressions/ListValue.cpp4
-rw-r--r--source/gameengine/Expressions/Operator1Expr.cpp2
-rw-r--r--source/gameengine/Expressions/Value.cpp2
-rw-r--r--source/gameengine/Expressions/VectorValue.cpp4
-rw-r--r--source/gameengine/Expressions/VectorValue.h4
8 files changed, 12 insertions, 12 deletions
diff --git a/source/gameengine/Expressions/EmptyValue.cpp b/source/gameengine/Expressions/EmptyValue.cpp
index 8170c588a28..7f3af9f649d 100644
--- a/source/gameengine/Expressions/EmptyValue.cpp
+++ b/source/gameengine/Expressions/EmptyValue.cpp
@@ -50,7 +50,7 @@ CEmptyValue::~CEmptyValue()
-CValue * CEmptyValue::Calc(VALUE_OPERATOR op, CValue * val)
+CValue *CEmptyValue::Calc(VALUE_OPERATOR op, CValue *val)
/*
* pre:
* ret: a new object containing the result of applying operator op to this
@@ -63,7 +63,7 @@ CValue * CEmptyValue::Calc(VALUE_OPERATOR op, CValue * val)
-CValue * CEmptyValue::CalcFinal(VALUE_DATA_TYPE dtype, VALUE_OPERATOR op, CValue * val)
+CValue * CEmptyValue::CalcFinal(VALUE_DATA_TYPE dtype, VALUE_OPERATOR op, CValue *val)
/*
* pre: the type of val is dtype
* ret: a new object containing the result of applying operator op to val and
diff --git a/source/gameengine/Expressions/KX_HashedPtr.cpp b/source/gameengine/Expressions/KX_HashedPtr.cpp
index 51550d52636..555ef7f9500 100644
--- a/source/gameengine/Expressions/KX_HashedPtr.cpp
+++ b/source/gameengine/Expressions/KX_HashedPtr.cpp
@@ -32,7 +32,7 @@
#include "KX_HashedPtr.h"
-unsigned int KX_Hash(void * inDWord)
+unsigned int KX_Hash(void *inDWord)
{
#if defined(_WIN64) && !defined(FREE_WINDOWS64)
unsigned __int64 key = (unsigned __int64)inDWord;
diff --git a/source/gameengine/Expressions/KX_HashedPtr.h b/source/gameengine/Expressions/KX_HashedPtr.h
index d822af38c44..acd9d4daafa 100644
--- a/source/gameengine/Expressions/KX_HashedPtr.h
+++ b/source/gameengine/Expressions/KX_HashedPtr.h
@@ -36,7 +36,7 @@
#include "MEM_guardedalloc.h"
#endif
-unsigned int KX_Hash(void * inDWord);
+unsigned int KX_Hash(void *inDWord);
class CHashedPtr
{
diff --git a/source/gameengine/Expressions/ListValue.cpp b/source/gameengine/Expressions/ListValue.cpp
index 5f97b03fed4..20c66bd7bc9 100644
--- a/source/gameengine/Expressions/ListValue.cpp
+++ b/source/gameengine/Expressions/ListValue.cpp
@@ -123,7 +123,7 @@ void CListValue::ReleaseAndRemoveAll()
-CValue* CListValue::FindValue(const STR_String & name)
+CValue* CListValue::FindValue(const STR_String &name)
{
for (int i=0; i < GetCount(); i++)
if (GetValue(i)->GetName() == name)
@@ -132,7 +132,7 @@ CValue* CListValue::FindValue(const STR_String & name)
return NULL;
}
-CValue* CListValue::FindValue(const char * name)
+CValue* CListValue::FindValue(const char *name)
{
for (int i=0; i < GetCount(); i++)
if (GetValue(i)->GetName() == name)
diff --git a/source/gameengine/Expressions/Operator1Expr.cpp b/source/gameengine/Expressions/Operator1Expr.cpp
index 98228dfbe7d..b985f76825d 100644
--- a/source/gameengine/Expressions/Operator1Expr.cpp
+++ b/source/gameengine/Expressions/Operator1Expr.cpp
@@ -31,7 +31,7 @@ effect: constucts an empty COperator1Expr
m_lhs = NULL;
}
-COperator1Expr::COperator1Expr(VALUE_OPERATOR op, CExpression * lhs)
+COperator1Expr::COperator1Expr(VALUE_OPERATOR op, CExpression *lhs)
/*
pre:
effect: constucts a COperator1Expr with op and lhs in it
diff --git a/source/gameengine/Expressions/Value.cpp b/source/gameengine/Expressions/Value.cpp
index 7b20b4b2d97..30a56c9165a 100644
--- a/source/gameengine/Expressions/Value.cpp
+++ b/source/gameengine/Expressions/Value.cpp
@@ -531,7 +531,7 @@ PyAttributeDef CValue::Attributes[] = {
{ NULL } //Sentinel
};
-PyObject *CValue::pyattr_get_name(void * self_v, const KX_PYATTRIBUTE_DEF *attrdef)
+PyObject *CValue::pyattr_get_name(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef)
{
CValue * self = static_cast<CValue *> (self_v);
return PyUnicode_From_STR_String(self->GetName());
diff --git a/source/gameengine/Expressions/VectorValue.cpp b/source/gameengine/Expressions/VectorValue.cpp
index 612de658ce9..a0e1b616d5e 100644
--- a/source/gameengine/Expressions/VectorValue.cpp
+++ b/source/gameengine/Expressions/VectorValue.cpp
@@ -47,7 +47,7 @@ CVectorValue::CVectorValue(float x,float y,float z, AllocationTYPE alloctype)
m_vec[KX_Z] = m_transformedvec[KX_Z] = z;
}
-CVectorValue::CVectorValue(double vec[],const char *name,AllocationTYPE alloctype)
+CVectorValue::CVectorValue(double vec[3], const char *name,AllocationTYPE alloctype)
{
SetCustomFlag1(false);//FancyOutput=false;
@@ -65,7 +65,7 @@ CVectorValue::CVectorValue(double vec[],const char *name,AllocationTYPE alloctyp
SetName(name);
}
-CVectorValue::CVectorValue(double vec[],AllocationTYPE alloctype)
+CVectorValue::CVectorValue(double vec[3], AllocationTYPE alloctype)
{
SetCustomFlag1(false);//FancyOutput=false;
diff --git a/source/gameengine/Expressions/VectorValue.h b/source/gameengine/Expressions/VectorValue.h
index 9b9f9612810..69f2d4b54ae 100644
--- a/source/gameengine/Expressions/VectorValue.h
+++ b/source/gameengine/Expressions/VectorValue.h
@@ -45,10 +45,10 @@ public:
CValue* CalcFinal(VALUE_DATA_TYPE dtype, VALUE_OPERATOR op, CValue *val);
- CVectorValue(double vec[],const char *name,AllocationTYPE alloctype=CValue::HEAPVALUE);
+ CVectorValue(double vec[3], const char *name,AllocationTYPE alloctype=CValue::HEAPVALUE);
CVectorValue() {};
- CVectorValue(double vec[],AllocationTYPE alloctype=CValue::HEAPVALUE);
+ CVectorValue(double vec[3], AllocationTYPE alloctype=CValue::HEAPVALUE);
CVectorValue(float x,float y,float z, AllocationTYPE alloctype = CValue::HEAPVALUE);
virtual ~CVectorValue();
//virtual bool ExportT3D(File *txtfile,bool bNoName=false);