diff options
| author | Dalai Felinto <dfelinto@gmail.com> | 2010-05-30 01:31:57 +0400 |
|---|---|---|
| committer | Dalai Felinto <dfelinto@gmail.com> | 2010-05-30 01:31:57 +0400 |
| commit | c6bec43330be0874b4116d259bbaf9fb90ed0556 (patch) | |
| tree | a1de833c9b4067a0659461ce8af20857678034ed /source/gameengine/Converter/KX_BlenderSceneConverter.h | |
| parent | 9d3157eed000e7c543d04f5ad3efc5990675903b (diff) | |
reverting previous commit from Mitchell. His commit went to the trunk instead of the branch :)
svn merge -r 29067:29066 https://svn.blender.org/svnroot/bf-blender/trunk/blender
Diffstat (limited to 'source/gameengine/Converter/KX_BlenderSceneConverter.h')
| -rw-r--r-- | source/gameengine/Converter/KX_BlenderSceneConverter.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/gameengine/Converter/KX_BlenderSceneConverter.h b/source/gameengine/Converter/KX_BlenderSceneConverter.h index 341e4546430..3dd3afb5662 100644 --- a/source/gameengine/Converter/KX_BlenderSceneConverter.h +++ b/source/gameengine/Converter/KX_BlenderSceneConverter.h @@ -142,7 +142,7 @@ public: struct Main* GetMainDynamicPath(const char *path); vector<struct Main*> &GetMainDynamic(); - bool LinkBlendFile(const char *path, char *group, char *filter, KX_Scene *scene_merge, char **err_str); + bool LinkBlendFile(const char *path, char *group, KX_Scene *scene_merge, char **err_str); bool MergeScene(KX_Scene *to, KX_Scene *from); RAS_MeshObject *ConvertMeshSpecial(KX_Scene* kx_scene, Main *maggie, const char *name); bool FreeBlendFile(struct Main *maggie); |