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-07-29 21:49:14 +0400
committerCampbell Barton <ideasman42@gmail.com>2012-07-29 21:49:14 +0400
commitf608b3c44402ef5c58217481d93e7fa83c9cd7cf (patch)
treecc8211154eb5a3cf9e1d89484cbe48facd51b90e /source/gameengine/Converter/KX_BlenderSceneConverter.cpp
parentc41e1e434ab9defa35178ad8886d81b60d889e9a (diff)
code cleanup:
- building without python works again - rename maxi/mini to i_max/i_min (so thay are available for function names) - some minor edits to IK stretch setting (no functional changes).
Diffstat (limited to 'source/gameengine/Converter/KX_BlenderSceneConverter.cpp')
-rw-r--r--source/gameengine/Converter/KX_BlenderSceneConverter.cpp7
1 files changed, 6 insertions, 1 deletions
diff --git a/source/gameengine/Converter/KX_BlenderSceneConverter.cpp b/source/gameengine/Converter/KX_BlenderSceneConverter.cpp
index 651c1a70f45..1c3352454a2 100644
--- a/source/gameengine/Converter/KX_BlenderSceneConverter.cpp
+++ b/source/gameengine/Converter/KX_BlenderSceneConverter.cpp
@@ -1043,9 +1043,11 @@ bool KX_BlenderSceneConverter::LinkBlendFile(BlendHandle *bpy_openlib, const cha
delete other;
}
+#ifdef WITH_PYTHON
/* Handle any text datablocks */
if (options & LIB_LOAD_LOAD_SCRIPTS)
addImportMain(main_newlib);
+#endif
/* Now handle all the actions */
if (options & LIB_LOAD_LOAD_ACTIONS) {
@@ -1339,8 +1341,11 @@ bool KX_BlenderSceneConverter::FreeBlendFile(struct Main *maggie)
}
}
- /* make sure this maggie is removed from the import list if it's there (this operation is safe if it isn't in the list) */
+#ifdef WITH_PYTHON
+ /* make sure this maggie is removed from the import list if it's there
+ * (this operation is safe if it isn't in the list) */
removeImportMain(maggie);
+#endif
free_main(maggie);