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:
-rw-r--r--source/blender/editors/mesh/mesh_navmesh.c1
-rw-r--r--source/gameengine/Converter/BL_BlenderDataConversion.cpp2
-rw-r--r--source/gameengine/Ketsji/KX_GameObject.cpp2
3 files changed, 2 insertions, 3 deletions
diff --git a/source/blender/editors/mesh/mesh_navmesh.c b/source/blender/editors/mesh/mesh_navmesh.c
index cb4f7a37130..436c924a7d7 100644
--- a/source/blender/editors/mesh/mesh_navmesh.c
+++ b/source/blender/editors/mesh/mesh_navmesh.c
@@ -32,6 +32,7 @@
#include "DNA_scene_types.h"
#include "DNA_object_types.h"
+#include "DNA_mesh_types.h"
#include "DNA_meshdata_types.h"
#include "DNA_modifier_types.h"
#include "DNA_ID.h"
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];