archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

fix for struct definition building with msvc2008 and some style cleanup.

Browse Source
This commit is contained in:
Campbell Barton
2013-03-24 01:19:55 +00:00
parent d9eadf442e
commit 92d7955d13
18 changed files with 41 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
source/blender/blenlib/BLI_callbacks.h
View File

@@ -54,7 +54,7 @@ typedef enum {
} eCbEvent; } eCbEvent;
typedef struct { typedef struct bCallbackFuncStore {
struct bCallbackFuncStore *next, *prev; struct bCallbackFuncStore *next, *prev;
void (*func)(struct Main *, struct ID *, void *arg); void (*func)(struct Main *, struct ID *, void *arg);
void *arg; void *arg;

4
source/gameengine/Ketsji/KX_ObjectActuator.cpp
View File

@@ -215,8 +215,8 @@ bool KX_ObjectActuator::Update()
m_previous_error = e; m_previous_error = e;
m_error_accumulator = I; m_error_accumulator = I;
parent->ApplyForce(m_force,(m_bitLocalFlag.LinearVelocity) != 0); parent->ApplyForce(m_force,(m_bitLocalFlag.LinearVelocity) != 0);
} else if(m_bitLocalFlag.CharacterMotion) }
{ else if (m_bitLocalFlag.CharacterMotion) {
MT_Vector3 dir = m_dloc; MT_Vector3 dir = m_dloc;
if (m_bitLocalFlag.AddOrSetCharLoc) { if (m_bitLocalFlag.AddOrSetCharLoc) {

3
source/gameengine/Ketsji/KX_Scene.cpp
View File

@@ -1173,8 +1173,7 @@ void KX_Scene::ReplaceMesh(class CValue* obj,void* meshobj, bool use_gfx, bool u
} }
newobj->SetDeformer(modifierDeformer); newobj->SetDeformer(modifierDeformer);
} }
else if (bHasShapeKey) else if (bHasShapeKey) {
{
BL_ShapeDeformer* shapeDeformer; BL_ShapeDeformer* shapeDeformer;
if (bHasArmature) if (bHasArmature)
{ {