← Back to branch summary

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

« back to all changes in this revision

Viewing changes to source/gameengine/GameLogic/SCA_ILogicBrick.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_ILogicBrick.cpp
202
202
};
203
203
 
204
204
PyMethodDef SCA_ILogicBrick::Methods[] = {
205
 
  {NULL,NULL} //Sentinel
 
205
        {NULL,NULL} //Sentinel
206
206
};
207
207
 
208
208
PyAttributeDef SCA_ILogicBrick::Attributes[] = {
231
231
}
232
232
 
233
233
/*Attribute functions */
234
 
PyObject* SCA_ILogicBrick::pyattr_get_owner(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef)
 
234
PyObject *SCA_ILogicBrick::pyattr_get_owner(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef)
235
235
{
236
 
        SCA_ILogicBrick* self= static_cast<SCA_ILogicBrick*>(self_v);
 
236
        SCA_ILogicBrick* self = static_cast<SCA_ILogicBrick*>(self_v);
237
237
        CValue* parent = self->GetParent();
238
238
        
239
239
        if (parent)
254
254
        }
255
255
}
256
256
 
257
 
PyObject* SCA_ILogicBrick::BoolToPyArg(bool boolarg)
 
257
PyObject *SCA_ILogicBrick::BoolToPyArg(bool boolarg)
258
258
{
259
 
        return PyLong_FromSsize_t(boolarg? KX_TRUE: KX_FALSE);  
 
259
        return PyLong_FromLong(boolarg ? KX_TRUE: KX_FALSE);
260
260
}
261
261
 
262
262
#endif // WITH_PYTHON