← Back to branch summary

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

« back to all changes in this revision

Viewing changes to source/gameengine/GameLogic/SCA_IObject.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/GameLogic/SCA_IObject.cpp
224
224
                {
225
225
                        foundcontroller = (*itc);
226
226
                        break;
227
 
                }       
 
227
                }
228
228
        }
229
229
        return foundcontroller;
230
230
}
251
251
void SCA_IObject::Suspend()
252
252
{
253
253
        if ((!m_ignore_activity_culling) 
254
 
                && (!m_suspended))  {
 
254
                && (!m_suspended)) {
255
255
                m_suspended = true;
256
256
                /* flag suspend for all sensors */
257
257
                SCA_SensorList::iterator i = m_sensors.begin();