← Back to branch summary

~ubuntu-branches/ubuntu/saucy/blender/saucy-proposed

« back to all changes in this revision

Viewing changes to source/gameengine/Converter/BL_ArmatureActuator.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/Converter/BL_ArmatureActuator.h
49
49
        Py_Header
50
50
public:
51
51
        BL_ArmatureActuator(SCA_IObject* gameobj,
52
 
                                                int type,
53
 
                                                const char *posechannel,
54
 
                                                const char *constraintname,
55
 
                                                KX_GameObject* targetobj,
56
 
                                                KX_GameObject* subtargetobj,
57
 
                                                float weight,
58
 
                                                float influence);
 
52
                            int type,
 
53
                            const char *posechannel,
 
54
                            const char *constraintname,
 
55
                            KX_GameObject* targetobj,
 
56
                            KX_GameObject* subtargetobj,
 
57
                            float weight,
 
58
                            float influence);
59
59
 
60
60
        virtual ~BL_ArmatureActuator();
61
61
 
73
73
#ifdef WITH_PYTHON
74
74
 
75
75
        /* These are used to get and set m_target */
76
 
        static PyObject* pyattr_get_constraint(void *self, const struct KX_PYATTRIBUTE_DEF *attrdef);
77
 
        static PyObject* pyattr_get_object(void *self, const struct KX_PYATTRIBUTE_DEF *attrdef);
 
76
        static PyObject *pyattr_get_constraint(void *self, const struct KX_PYATTRIBUTE_DEF *attrdef);
 
77
        static PyObject *pyattr_get_object(void *self, const struct KX_PYATTRIBUTE_DEF *attrdef);
78
78
        static int pyattr_set_object(void *self, const struct KX_PYATTRIBUTE_DEF *attrdef, PyObject *value);
79
79
 
80
 
#endif // WITH_PYTHON
 
80
#endif  /* WITH_PYTHON */
81
81
 
82
82
private:
83
83
        // identify the constraint that this actuator controls
93
93
        int                             m_type;
94
94
};
95
95
 
96
 
#endif //__BL_ARMATUREACTUATOR_H__
97
 
 
98
 
 
 
96
#endif  /* __BL_ARMATUREACTUATOR_H__ */