diff options
Diffstat (limited to 'source/gameengine')
-rw-r--r-- | source/gameengine/Converter/BL_BlenderDataConversion.cpp | 2 | ||||
-rw-r--r-- | source/gameengine/GamePlayer/ghost/GPG_ghost.cpp | 6 | ||||
-rw-r--r-- | source/gameengine/Ketsji/KX_PythonInit.cpp | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/source/gameengine/Converter/BL_BlenderDataConversion.cpp b/source/gameengine/Converter/BL_BlenderDataConversion.cpp index c2cfd8808a9..ec99de45918 100644 --- a/source/gameengine/Converter/BL_BlenderDataConversion.cpp +++ b/source/gameengine/Converter/BL_BlenderDataConversion.cpp @@ -962,7 +962,7 @@ RAS_MeshObject* BL_ConvertMesh(Mesh* mesh, Object* blenderobj, KX_Scene* scene, if (CustomData_get_layer_index(&dm->faceData, CD_TANGENT) == -1) { bool generate_data = false; if (CustomData_get_layer_index(&dm->loopData, CD_TANGENT) == -1) { - DM_calc_loop_tangents(dm); + DM_calc_loop_tangents(dm, true, NULL, 0); generate_data = true; } DM_generate_tangent_tessface_data(dm, generate_data); diff --git a/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp b/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp index eee53b775a9..a69a8eae55d 100644 --- a/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp +++ b/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp @@ -455,9 +455,9 @@ int main(int argc, char** argv) init_nodesystem(); - initglobals(); + BKE_blender_globals_init(); - // We load our own G.main, so free the one that initglobals() gives us + // We load our own G.main, so free the one that BKE_blender_globals_init() gives us BKE_main_free(G.main); G.main = NULL; @@ -1132,7 +1132,7 @@ int main(int argc, char** argv) } } - /* refer to WM_exit_ext() and free_blender(), + /* refer to WM_exit_ext() and BKE_blender_free(), * these are not called in the player but we need to match some of there behavior here, * if the order of function calls or blenders state isn't matching that of blender proper, * we may get troubles later on */ diff --git a/source/gameengine/Ketsji/KX_PythonInit.cpp b/source/gameengine/Ketsji/KX_PythonInit.cpp index 76eb915a30d..9f173a567ee 100644 --- a/source/gameengine/Ketsji/KX_PythonInit.cpp +++ b/source/gameengine/Ketsji/KX_PythonInit.cpp @@ -134,7 +134,7 @@ extern "C" { #include "BKE_global.h" #include "BKE_library.h" #include "BKE_appdir.h" -#include "BKE_blender.h" +#include "BKE_blender_version.h" #include "BLI_blenlib.h" #include "GPU_material.h" #include "MEM_guardedalloc.h" |