2.50:
svn merge https://svn.blender.org/svnroot/bf-blender/trunk/blender -r19820:HEAD Notes: * Game and sequencer RNA, and sequencer header are now out of date a bit after changes in trunk. * I didn't know how to port these bugfixes, most likely they are not needed anymore. * Fix "duplicate strip" always increase the user count for ipo. * IPO pinning on sequencer strips was lost during Undo.
This commit is contained in:
@@ -111,7 +111,7 @@ CValue* SCA_MouseSensor::GetReplica()
|
||||
{
|
||||
SCA_MouseSensor* replica = new SCA_MouseSensor(*this);
|
||||
// this will copy properties and so on...
|
||||
CValue::AddDataToReplica(replica);
|
||||
replica->ProcessReplica();
|
||||
replica->Init();
|
||||
|
||||
return replica;
|
||||
@@ -144,7 +144,7 @@ SCA_IInputDevice::KX_EnumInputs SCA_MouseSensor::GetHotKey()
|
||||
|
||||
|
||||
|
||||
bool SCA_MouseSensor::Evaluate(CValue* event)
|
||||
bool SCA_MouseSensor::Evaluate()
|
||||
{
|
||||
bool result = false;
|
||||
bool reset = m_reset && m_level;
|
||||
@@ -296,8 +296,13 @@ KX_PYMETHODDEF_DOC_O(SCA_MouseSensor, getButtonStatus,
|
||||
/* ------------------------------------------------------------------------- */
|
||||
|
||||
PyTypeObject SCA_MouseSensor::Type = {
|
||||
PyObject_HEAD_INIT(NULL)
|
||||
0,
|
||||
#if (PY_VERSION_HEX >= 0x02060000)
|
||||
PyVarObject_HEAD_INIT(NULL, 0)
|
||||
#else
|
||||
/* python 2.5 and below */
|
||||
PyObject_HEAD_INIT( NULL ) /* required py macro */
|
||||
0, /* ob_size */
|
||||
#endif
|
||||
"SCA_MouseSensor",
|
||||
sizeof(PyObjectPlus_Proxy),
|
||||
0,
|
||||
@@ -342,6 +347,10 @@ PyObject* SCA_MouseSensor::py_getattro(PyObject *attr)
|
||||
py_getattro_up(SCA_ISensor);
|
||||
}
|
||||
|
||||
PyObject* SCA_MouseSensor::py_getattro_dict() {
|
||||
py_getattro_dict_up(SCA_ISensor);
|
||||
}
|
||||
|
||||
int SCA_MouseSensor::py_setattro(PyObject *attr, PyObject *value)
|
||||
{
|
||||
py_setattro_up(SCA_ISensor);
|
||||
|
||||
Reference in New Issue
Block a user