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>2013-03-17 23:13:04 +0400
committerCampbell Barton <ideasman42@gmail.com>2013-03-17 23:13:04 +0400
commit09c41019a8ecb259b2376b5c22c99f54b59f8f24 (patch)
tree64802a773768eaae39b8ec315b582123f16707fa /source/gameengine/Converter/KX_BlenderSceneConverter.cpp
parent16b82845eee4198b2d56aa5a5c373008f5070f7f (diff)
use const pointers for file loading and booleans for animation system return values passed as pointers.
Diffstat (limited to 'source/gameengine/Converter/KX_BlenderSceneConverter.cpp')
-rw-r--r--source/gameengine/Converter/KX_BlenderSceneConverter.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/source/gameengine/Converter/KX_BlenderSceneConverter.cpp b/source/gameengine/Converter/KX_BlenderSceneConverter.cpp
index cd5dec4669d..86e8c9c6e76 100644
--- a/source/gameengine/Converter/KX_BlenderSceneConverter.cpp
+++ b/source/gameengine/Converter/KX_BlenderSceneConverter.cpp
@@ -1050,12 +1050,12 @@ KX_LibLoadStatus *KX_BlenderSceneConverter::LinkBlendFileMemory(void *data, int
return LinkBlendFile(bpy_openlib, path, group, scene_merge, err_str, options);
}
-KX_LibLoadStatus *KX_BlenderSceneConverter::LinkBlendFilePath(const char *path, char *group, KX_Scene *scene_merge, char **err_str, short options)
+KX_LibLoadStatus *KX_BlenderSceneConverter::LinkBlendFilePath(const char *filepath, char *group, KX_Scene *scene_merge, char **err_str, short options)
{
- BlendHandle *bpy_openlib = BLO_blendhandle_from_file((char *)path, NULL);
+ BlendHandle *bpy_openlib = BLO_blendhandle_from_file(filepath, NULL);
// Error checking is done in LinkBlendFile
- return LinkBlendFile(bpy_openlib, path, group, scene_merge, err_str, options);
+ return LinkBlendFile(bpy_openlib, filepath, group, scene_merge, err_str, options);
}
static void load_datablocks(Main *main_newlib, BlendHandle *bpy_openlib, const char *path, int idcode)