diff options
| author | Nick Samarin <nicks1987@bigmir.net> | 2010-07-14 11:35:39 +0400 |
|---|---|---|
| committer | Nick Samarin <nicks1987@bigmir.net> | 2010-07-14 11:35:39 +0400 |
| commit | 81021db4f9ccd75f57401c030e7b18eba442b589 (patch) | |
| tree | 35c295624319a1524606935d18dda75498bae545 /source/gameengine/Ketsji/KX_Scene.cpp | |
| parent | 852b84745c60c6b82ededbe00c4906ca8d2f5944 (diff) | |
| parent | 64091ff5bd6258cd05cf4b1d96da22cb3aef6976 (diff) | |
synched with trunk at revision 30243
Diffstat (limited to 'source/gameengine/Ketsji/KX_Scene.cpp')
| -rw-r--r-- | source/gameengine/Ketsji/KX_Scene.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/gameengine/Ketsji/KX_Scene.cpp b/source/gameengine/Ketsji/KX_Scene.cpp index c7398e8e3ee..950b1ea793d 100644 --- a/source/gameengine/Ketsji/KX_Scene.cpp +++ b/source/gameengine/Ketsji/KX_Scene.cpp @@ -1772,7 +1772,7 @@ bool KX_Scene::MergeScene(KX_Scene *other) } - GetBucketManager()->MergeBucketManager(other->GetBucketManager()); + GetBucketManager()->MergeBucketManager(other->GetBucketManager(), this); /* move materials across, assume they both use the same scene-converters */ GetSceneConverter()->MergeScene(this, other); |