← Back to branch summary

~ubuntu-branches/ubuntu/utopic/blender/utopic-proposed

« back to all changes in this revision

Viewing changes to source/gameengine/Rasterizer/RAS_BucketManager.cpp

  • Committer: Package Import Robot
  • Author(s): Matthias Klose
  • Date: 2014-02-19 11:24:23 UTC
  • mfrom: (14.2.23 sid)
  • Revision ID: package-import@ubuntu.com-20140219112423-rkmaz2m7ha06d4tk
Tags: 2.69-3ubuntu1
* Merge with Debian; remaining changes:
  - Configure without OpenImageIO on armhf, as it is not available on
    Ubuntu.

Show diffs side-by-side

added added

removed removed

Lines of Context:
source/gameengine/Rasterizer/RAS_BucketManager.cpp
378
378
{
379
379
        /* concatinate lists */
380
380
        // printf("BEFORE %d %d\n", GetSolidBuckets().size(), GetAlphaBuckets().size());
381
 
        BucketList::iterator it;
382
 
 
383
 
        for (it = other->GetSolidBuckets().begin(); it != other->GetSolidBuckets().end(); ++it)
384
 
                (*it)->GetPolyMaterial()->Replace_IScene(scene);
385
381
 
386
382
        GetSolidBuckets().insert( GetSolidBuckets().end(), other->GetSolidBuckets().begin(), other->GetSolidBuckets().end() );
387
383
        other->GetSolidBuckets().clear();
388
384
 
389
 
        for (it = other->GetAlphaBuckets().begin(); it != other->GetAlphaBuckets().end(); ++it)
390
 
                (*it)->GetPolyMaterial()->Replace_IScene(scene);
391
 
 
392
385
        GetAlphaBuckets().insert( GetAlphaBuckets().end(), other->GetAlphaBuckets().begin(), other->GetAlphaBuckets().end() );
393
386
        other->GetAlphaBuckets().clear();
394
387
        //printf("AFTER %d %d\n", GetSolidBuckets().size(), GetAlphaBuckets().size());