← Back to branch summary

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

« back to all changes in this revision

Viewing changes to source/gameengine/Converter/BL_ArmatureActuator.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/Converter/BL_ArmatureActuator.cpp
146
146
bool BL_ArmatureActuator::Update(double curtime, bool frame)
147
147
{
148
148
        // the only role of this actuator is to ensure that the armature pose will be evaluated
149
 
        bool result = false;    
 
149
        bool result = false;
150
150
        bool bNegativeEvent = IsNegativeEvent();
151
151
        RemoveAllEvents();
152
152
 
227
227
        { NULL }        //Sentinel
228
228
};
229
229
 
230
 
PyObject* BL_ArmatureActuator::pyattr_get_object(void *self, const struct KX_PYATTRIBUTE_DEF *attrdef)
 
230
PyObject *BL_ArmatureActuator::pyattr_get_object(void *self, const struct KX_PYATTRIBUTE_DEF *attrdef)
231
231
{
232
232
        BL_ArmatureActuator* actuator = static_cast<BL_ArmatureActuator*>(self);
233
233
        KX_GameObject *target = (!strcmp(attrdef->m_name, "target")) ? actuator->m_gametarget : actuator->m_gamesubtarget;
234
 
        if (!target)    
 
234
        if (!target)
235
235
                Py_RETURN_NONE;
236
236
        else
237
237
                return target->GetProxy();
247
247
                return PY_SET_ATTR_FAIL; // ConvertPythonToGameObject sets the error
248
248
                
249
249
        if (target != NULL)
250
 
                target->UnregisterActuator(actuator);   
 
250
                target->UnregisterActuator(actuator);
251
251
 
252
252
        target = gameobj;
253
253
                
257
257
        return PY_SET_ATTR_SUCCESS;
258
258
}
259
259
 
260
 
PyObject* BL_ArmatureActuator::pyattr_get_constraint(void *self, const struct KX_PYATTRIBUTE_DEF *attrdef)
 
260
PyObject *BL_ArmatureActuator::pyattr_get_constraint(void *self, const struct KX_PYATTRIBUTE_DEF *attrdef)
261
261
{
262
262
        BL_ArmatureActuator* actuator = static_cast<BL_ArmatureActuator*>(self);
263
263
        BL_ArmatureConstraint* constraint = actuator->m_constraint;
264
 
        if (!constraint)        
 
264
        if (!constraint)
265
265
                Py_RETURN_NONE;
266
266
        else
267
267
                return constraint->GetProxy();