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:
authorCampbell Barton <ideasman42@gmail.com>2012-11-10 09:42:50 +0400
committerCampbell Barton <ideasman42@gmail.com>2012-11-10 09:42:50 +0400
commit936f0388e843ba3a261b364d633eb3bdd5b3ca99 (patch)
tree19e08b071efb434e869243252adad51bbb717865 /source/gameengine/Converter/KX_BlenderSceneConverter.cpp
parentfc2b52b837daa5d92848d3afc71bddc58d8e92e5 (diff)
code cleanup: some warnings and formatting for PyMethodDef's in the BGE.
Diffstat (limited to 'source/gameengine/Converter/KX_BlenderSceneConverter.cpp')
-rw-r--r--source/gameengine/Converter/KX_BlenderSceneConverter.cpp11
1 files changed, 8 insertions, 3 deletions
diff --git a/source/gameengine/Converter/KX_BlenderSceneConverter.cpp b/source/gameengine/Converter/KX_BlenderSceneConverter.cpp
index 30a4209965e..d1684db0f5a 100644
--- a/source/gameengine/Converter/KX_BlenderSceneConverter.cpp
+++ b/source/gameengine/Converter/KX_BlenderSceneConverter.cpp
@@ -103,6 +103,7 @@ extern "C"
#include "KX_MeshProxy.h"
#include "RAS_MeshObject.h"
extern "C" {
+ #include "PIL_time.h"
#include "BKE_context.h"
#include "BLO_readfile.h"
#include "BKE_idcode.h"
@@ -957,10 +958,12 @@ static void load_datablocks(Main *main_newlib, BlendHandle *bpy_openlib, const c
bool KX_BlenderSceneConverter::LinkBlendFile(BlendHandle *bpy_openlib, const char *path, char *group, KX_Scene *scene_merge, char **err_str, short options)
{
Main *main_newlib; /* stored as a dynamic 'main' until we free it */
- int idcode= BKE_idcode_from_name(group);
+ const int idcode = BKE_idcode_from_name(group);
ReportList reports;
static char err_local[255];
-
+
+// TIMEIT_START(bge_link_blend_file);
+
/* only scene and mesh supported right now */
if (idcode!=ID_SCE && idcode!=ID_ME &&idcode!=ID_AC) {
snprintf(err_local, sizeof(err_local), "invalid ID type given \"%s\"\n", group);
@@ -1059,7 +1062,9 @@ bool KX_BlenderSceneConverter::LinkBlendFile(BlendHandle *bpy_openlib, const cha
}
}
}
-
+
+// TIMEIT_END(bge_link_blend_file);
+
return true;
}