diff options
author | Mitchell Stokes <mogurijin@gmail.com> | 2013-08-17 08:37:25 +0400 |
---|---|---|
committer | Mitchell Stokes <mogurijin@gmail.com> | 2013-08-17 08:37:25 +0400 |
commit | 82c845425f0a5e2805ed7e9f6cb74920fa96229f (patch) | |
tree | 04d6b5fe7db2952b1a402aa2219637b2f4b810f6 /source/gameengine/Rasterizer | |
parent | 51bca0d7dc8fb5033778796e14dd01c1c7f4355a (diff) |
BGE: Adding partial support for LibLoaded lights with GLSL materials.
Any GLSL materials loaded after lights are LibLoaded will now use the lights in
heir shaders. This includes materials loaded from the same scene as the LibLoaded
lights. We could later add a new flag to LibLoad to recompile all existing shaders,
but this commit should offer a lot more flexibility as is.
Diffstat (limited to 'source/gameengine/Rasterizer')
-rw-r--r-- | source/gameengine/Rasterizer/RAS_BucketManager.cpp | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/source/gameengine/Rasterizer/RAS_BucketManager.cpp b/source/gameengine/Rasterizer/RAS_BucketManager.cpp index 7d1190bef5c..713d324bf17 100644 --- a/source/gameengine/Rasterizer/RAS_BucketManager.cpp +++ b/source/gameengine/Rasterizer/RAS_BucketManager.cpp @@ -378,17 +378,10 @@ void RAS_BucketManager::MergeBucketManager(RAS_BucketManager *other, SCA_IScene { /* concatinate lists */ // printf("BEFORE %d %d\n", GetSolidBuckets().size(), GetAlphaBuckets().size()); - BucketList::iterator it; - - for (it = other->GetSolidBuckets().begin(); it != other->GetSolidBuckets().end(); ++it) - (*it)->GetPolyMaterial()->Replace_IScene(scene); GetSolidBuckets().insert( GetSolidBuckets().end(), other->GetSolidBuckets().begin(), other->GetSolidBuckets().end() ); other->GetSolidBuckets().clear(); - for (it = other->GetAlphaBuckets().begin(); it != other->GetAlphaBuckets().end(); ++it) - (*it)->GetPolyMaterial()->Replace_IScene(scene); - GetAlphaBuckets().insert( GetAlphaBuckets().end(), other->GetAlphaBuckets().begin(), other->GetAlphaBuckets().end() ); other->GetAlphaBuckets().clear(); //printf("AFTER %d %d\n", GetSolidBuckets().size(), GetAlphaBuckets().size()); |