archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

2.50:

Browse Source 
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:
Brecht Van Lommel
2009-06-08 20:08:19 +00:00
parent e93db433a0 d76a6f5231
commit c8b4cf9206
594 changed files with 28292 additions and 13753 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
source/gameengine/GameLogic/SCA_NORController.cpp
View File

@@ -66,26 +66,19 @@ void SCA_NORController::Trigger(SCA_LogicManager* logicmgr)
!(is==m_linkedsensors.end());is++)
{
SCA_ISensor* sensor = *is;
if (sensor->IsPositiveTrigger())
if (sensor->GetState())
{
sensorresult = false;
break;
}
}
CValue* newevent = new CBoolValue(sensorresult);
for (vector<SCA_IActuator*>::const_iterator i=m_linkedactuators.begin();
!(i==m_linkedactuators.end());i++)
{
SCA_IActuator* actua = *i;//m_linkedactuators.at(i);
logicmgr->AddActiveActuator(actua,newevent);
SCA_IActuator* actua = *i;
logicmgr->AddActiveActuator(actua,sensorresult);
}
// every actuator that needs the event, has a it's own reference to it now so
// release it (so to be clear: if there is no actuator, it's deleted right now)
newevent->Release();
}
@@ -94,7 +87,7 @@ CValue* SCA_NORController::GetReplica()
{
CValue* replica = new SCA_NORController(*this);
// this will copy properties and so on...
CValue::AddDataToReplica(replica);
replica->ProcessReplica();
return replica;
}
@@ -107,8 +100,13 @@ CValue* SCA_NORController::GetReplica()
/* Integration hooks ------------------------------------------------------- */
PyTypeObject SCA_NORController::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_NORController",
sizeof(PyObjectPlus_Proxy),
0,
@@ -145,4 +143,8 @@ PyObject* SCA_NORController::py_getattro(PyObject *attr) {
py_getattro_up(SCA_IController);
}
PyObject* SCA_NORController::py_getattro_dict() {
py_getattro_dict_up(SCA_IController);
}
/* eof */