← Back to branch summary

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

« back to all changes in this revision

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

  • 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_SceneActuator.h
2
2
//
3
3
// Add object to the game world on action of this actuator
4
4
//
5
 
// $Id: KX_SceneActuator.h 15638 2008-07-19 07:45:19Z ben2610 $
 
5
// $Id: KX_SceneActuator.h 20193 2009-05-14 07:59:44Z campbellbarton $
6
6
//
7
7
// ***** BEGIN GPL LICENSE BLOCK *****
8
8
//
92
92
        /* Python interface ---------------------------------------------------- */
93
93
        /* --------------------------------------------------------------------- */
94
94
 
95
 
        virtual PyObject* _getattr(const STR_String& attr);
 
95
        virtual PyObject* py_getattro(PyObject *attr);
 
96
        virtual PyObject* py_getattro_dict();
 
97
        virtual int py_setattro(PyObject *attr, PyObject *value);
96
98
 
97
99
        /* 1. set                                                                */
98
100
        /* Removed */
99
101
          
100
102
        /* 2. setUseRestart:                                                     */
101
 
        KX_PYMETHOD_DOC(KX_SceneActuator,SetUseRestart);
 
103
        KX_PYMETHOD_DOC_VARARGS(KX_SceneActuator,SetUseRestart);
102
104
        /* 3. getUseRestart:                                                     */
103
 
        KX_PYMETHOD_DOC(KX_SceneActuator,GetUseRestart);
 
105
        KX_PYMETHOD_DOC_NOARGS(KX_SceneActuator,GetUseRestart);
104
106
        /* 4. setScene:                                                          */
105
 
        KX_PYMETHOD_DOC(KX_SceneActuator,SetScene);
 
107
        KX_PYMETHOD_DOC_VARARGS(KX_SceneActuator,SetScene);
106
108
        /* 5. getScene:                                                          */
107
 
        KX_PYMETHOD_DOC(KX_SceneActuator,GetScene);
 
109
        KX_PYMETHOD_DOC_NOARGS(KX_SceneActuator,GetScene);
108
110
        /* 6. setCamera:                                                          */
109
 
        KX_PYMETHOD_DOC(KX_SceneActuator,SetCamera);
 
111
        KX_PYMETHOD_DOC_O(KX_SceneActuator,SetCamera);
110
112
        /* 7. getCamera:                                                          */
111
 
        KX_PYMETHOD_DOC(KX_SceneActuator,GetCamera);
 
113
        KX_PYMETHOD_DOC_NOARGS(KX_SceneActuator,GetCamera);
112
114
        
 
115
        static PyObject* pyattr_get_camera(void *self, const struct KX_PYATTRIBUTE_DEF *attrdef);
 
116
        static int pyattr_set_camera(void *self, const struct KX_PYATTRIBUTE_DEF *attrdef, PyObject *value);
 
117
 
113
118
}; /* end of class KXSceneActuator */
114
119
 
115
120
#endif