diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2012-02-20 03:36:10 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2012-02-20 03:36:10 +0400 |
| commit | 40c59b1a3d8497dd77601971aac73d9db9cee187 (patch) | |
| tree | daac221b13b7bdc78642fd1eb83b4bbebe6babdc /source/gameengine | |
| parent | e9f93b91177c0fe80c2bc2cbfe9cf5a9e951d604 (diff) | |
minor edits to have the game engine and player building.
Diffstat (limited to 'source/gameengine')
| -rw-r--r-- | source/gameengine/Converter/BL_BlenderDataConversion.cpp | 2 | ||||
| -rw-r--r-- | source/gameengine/Ketsji/KX_GameObject.cpp | 2 |
2 files changed, 1 insertions, 3 deletions
diff --git a/source/gameengine/Converter/BL_BlenderDataConversion.cpp b/source/gameengine/Converter/BL_BlenderDataConversion.cpp index 1cecac4001c..884ab63f93b 100644 --- a/source/gameengine/Converter/BL_BlenderDataConversion.cpp +++ b/source/gameengine/Converter/BL_BlenderDataConversion.cpp @@ -1417,7 +1417,7 @@ static void my_tex_space_mesh(Mesh *me) my_boundbox_mesh(me, loc, size); - if(me->texflag & AUTOSPACE) { + if(me->texflag & ME_AUTOSPACE) { if(me->key) { kb= me->key->refkey; if (kb) { diff --git a/source/gameengine/Ketsji/KX_GameObject.cpp b/source/gameengine/Ketsji/KX_GameObject.cpp index 023c3dcbfc9..c32dc6c1096 100644 --- a/source/gameengine/Ketsji/KX_GameObject.cpp +++ b/source/gameengine/Ketsji/KX_GameObject.cpp @@ -1169,8 +1169,6 @@ void KX_GameObject::NodeSetWorldScale(const MT_Vector3& scale) return; } - MT_Vector3 *local = new MT_Vector3(scale); - p_scale[0] = 1/p_scale[0]; p_scale[1] = 1/p_scale[1]; p_scale[2] = 1/p_scale[2]; |