← Back to branch summary

~ubuntu-branches/ubuntu/lucid/blender/lucid

« back to all changes in this revision

Viewing changes to source/gameengine/Ketsji/KX_IPhysicsController.cpp

  • Committer: Bazaar Package Importer
  • Author(s): Chris Coulson
  • Date: 2009-08-06 22:32:19 UTC
  • mfrom: (1.2.10 upstream)
  • Revision ID: james.westby@ubuntu.com-20090806223219-8z4eej1u8levu4pz
Tags: 2.49a+dfsg-0ubuntu1
https://launchpad.net/bugs/382153
* Merge from debian unstable, remaining changes:
  - debian/control: Build-depend on python-2.6 rather than python-2.5.
  - debian/misc/*.desktop: Add Spanish translation to .desktop 
    files.
  - debian/pyversions: 2.6.
  - debian/rules: Clean *.o of source/blender/python/api2_2x/
* New upstream release (LP: #382153).
* Refreshed patches:
  - 01_sanitize_sys.patch
  - 02_tmp_in_HOME
  - 10_use_systemwide_ftgl
  - 70_portability_platform_detection
* Removed patches merged upstream:
  - 30_fix_python_syntax_warning
  - 90_ubuntu_ffmpeg_52_changes

Show diffs side-by-side

added added

removed removed

Lines of Context:
source/gameengine/Ketsji/KX_IPhysicsController.cpp
1
1
/**
2
2
 * @file KX_IPhysicsController.cpp
3
 
 * $Id: KX_IPhysicsController.cpp 15444 2008-07-05 17:05:05Z lukep $
 
3
 * $Id: KX_IPhysicsController.cpp 20239 2009-05-17 12:51:51Z ben2610 $
4
4
 *
5
5
 * ***** BEGIN GPL LICENSE BLOCK *****
6
6
 *
35
35
 
36
36
#include "PHY_DynamicTypes.h"
37
37
 
38
 
KX_IPhysicsController::KX_IPhysicsController(bool dyna,void* userdata)
 
38
KX_IPhysicsController::KX_IPhysicsController(bool dyna, bool sensor, bool compound, void* userdata)
39
39
 
40
40
:       m_bDyna(dyna),
 
41
        m_bSensor(sensor),
 
42
        m_bCompound(compound),
41
43
        m_suspendDynamics(false),
42
44
        m_userdata(userdata)
43
45
{