← Back to branch summary

~ubuntu-branches/ubuntu/trusty/blender/trusty

« back to all changes in this revision

Viewing changes to source/gameengine/SceneGraph/SG_Tree.cpp

  • Committer: Package Import Robot
  • Author(s): Jeremy Bicha
  • Date: 2013-03-06 12:08:47 UTC
  • mfrom: (1.5.1) (14.1.8 experimental)
  • Revision ID: package-import@ubuntu.com-20130306120847-frjfaryb2zrotwcg
Tags: 2.66a-1ubuntu1
https://launchpad.net/bugs/1076930
https://launchpad.net/bugs/1089256
https://launchpad.net/bugs/1052743
https://launchpad.net/bugs/999024
* Resynchronize with Debian (LP: #1076930, #1089256, #1052743, #999024,
  #1122888, #1147084)
* debian/control:
  - Lower build-depends on libavcodec-dev since we're not
    doing the libav9 transition in Ubuntu yet

Show diffs side-by-side

added added

removed removed

Lines of Context:
source/gameengine/SceneGraph/SG_Tree.cpp
236
236
 
237
237
SG_Tree* SG_TreeFactory::MakeTreeDown(SG_BBox &bbox)
238
238
{
239
 
        if (m_objects.size() == 0)
 
239
        if (m_objects.empty())
240
240
                return NULL;
241
241
        if (m_objects.size() == 1)
242
242
                return *m_objects.begin();
296
296
                                {
297
297
                                        lefttree.Add(*it);
298
298
                                        hasleft++;
299
 
                                } else {
 
299
                                }
 
300
                                else {
300
301
                                        righttree.Add(*it);
301
302
                                        hasright++;
302
303
                                }