← Back to branch summary

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

« back to all changes in this revision

Viewing changes to source/gameengine/Converter/BL_ShapeActionActuator.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_ShapeActionActuator.cpp
83
83
        m_playtype(playtype),
84
84
        m_priority(priority),
85
85
        m_action(action),
86
 
        m_framepropname(framepropname), 
 
86
        m_framepropname(framepropname),
87
87
        m_propname(propname)
88
88
{
89
89
        m_idptr = new PointerRNA();
316
316
                        m_localtime += (length/m_stridelength) * deltapos.length();
317
317
                        m_lastpos = newpos;
318
318
                }
319
 
                else{
 
319
                else {
320
320
                        SetLocalTime(curtime);
321
321
                }
322
322
        }
466
466
                                BLI_freelistN(&tchanbase);
467
467
                        }
468
468
                }
469
 
                else{
 
469
                else {
470
470
                        m_blendframe = 0.0f;
471
471
                }
472
472
        }
526
526
        { NULL }        //Sentinel
527
527
};
528
528
 
529
 
PyObject* BL_ShapeActionActuator::pyattr_get_action(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef)
 
529
PyObject *BL_ShapeActionActuator::pyattr_get_action(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef)
530
530
{
531
 
        BL_ShapeActionActuator* self= static_cast<BL_ShapeActionActuator*>(self_v);
 
531
        BL_ShapeActionActuator* self = static_cast<BL_ShapeActionActuator*>(self_v);
532
532
        return PyUnicode_FromString(self->GetAction() ? self->GetAction()->id.name+2 : "");
533
533
}
534
534
 
535
535
int BL_ShapeActionActuator::pyattr_set_action(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef, PyObject *value)
536
536
{
537
 
        BL_ShapeActionActuator* self= static_cast<BL_ShapeActionActuator*>(self_v);
 
537
        BL_ShapeActionActuator* self = static_cast<BL_ShapeActionActuator*>(self_v);
538
538
        /* exact copy of BL_ActionActuator's function from here down */
539
539
        if (!PyUnicode_Check(value))
540
540
        {