Revision: 44271
          
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=44271
Author:   campbellbarton
Date:     2012-02-19 23:36:10 +0000 (Sun, 19 Feb 2012)
Log Message:
-----------
minor edits to have the game engine and player building.

Modified Paths:
--------------
    trunk/blender/source/blender/editors/mesh/mesh_navmesh.c
    trunk/blender/source/gameengine/Converter/BL_BlenderDataConversion.cpp
    trunk/blender/source/gameengine/Ketsji/KX_GameObject.cpp

Modified: trunk/blender/source/blender/editors/mesh/mesh_navmesh.c
===================================================================
--- trunk/blender/source/blender/editors/mesh/mesh_navmesh.c    2012-02-19 
22:55:37 UTC (rev 44270)
+++ trunk/blender/source/blender/editors/mesh/mesh_navmesh.c    2012-02-19 
23:36:10 UTC (rev 44271)
@@ -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"

Modified: trunk/blender/source/gameengine/Converter/BL_BlenderDataConversion.cpp
===================================================================
--- trunk/blender/source/gameengine/Converter/BL_BlenderDataConversion.cpp      
2012-02-19 22:55:37 UTC (rev 44270)
+++ trunk/blender/source/gameengine/Converter/BL_BlenderDataConversion.cpp      
2012-02-19 23:36:10 UTC (rev 44271)
@@ -1417,7 +1417,7 @@
 
        my_boundbox_mesh(me, loc, size);
        
-       if(me->texflag & AUTOSPACE) {
+       if(me->texflag & ME_AUTOSPACE) {
                if(me->key) {
                        kb= me->key->refkey;
                        if (kb) {

Modified: trunk/blender/source/gameengine/Ketsji/KX_GameObject.cpp
===================================================================
--- trunk/blender/source/gameengine/Ketsji/KX_GameObject.cpp    2012-02-19 
22:55:37 UTC (rev 44270)
+++ trunk/blender/source/gameengine/Ketsji/KX_GameObject.cpp    2012-02-19 
23:36:10 UTC (rev 44271)
@@ -1169,8 +1169,6 @@
                        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];

_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs

Reply via email to