← Back to branch summary

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

« back to all changes in this revision

Viewing changes to source/gameengine/Ketsji/KX_NearSensor.h

  • 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/Ketsji/KX_NearSensor.h
74
74
 
75
75
        virtual void ReParent(SCA_IObject* parent);
76
76
        virtual bool    NewHandleCollision(void* obj1,void* obj2,
77
 
                                                 const PHY_CollData * coll_data); 
 
77
                                           const PHY_CollData * coll_data);
78
78
        virtual bool    BroadPhaseFilterCollision(void*obj1,void*obj2);
79
79
        virtual bool    BroadPhaseSensorFilterCollision(void* obj1,void* obj2) { return false; }
80
80
        virtual sensortype GetSensorType() { return ST_NEAR; }
100
100
                return 0;
101
101
        }
102
102
 
103
 
#endif // WITH_PYTHON
 
103
#endif  /* WITH_PYTHON */
104
104
 
105
105
};
106
106
 
107
 
#endif //__KX_NEARSENSOR_H__
108
 
 
 
107
#endif  /* __KX_NEARSENSOR_H__ */