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

There was a problem with the last merge :S

Browse Source 
Somehow it didnt finished and didnt added some files under the svn control
(found thanks to lguillaume that reported some files were missing)

Last merge fixed and also merged modifications up to revision 15584.

I checked the diff
svn diff --new . --old https://svn.blender.org/svnroot/bf-blender/trunk/blender
And everything seems to be right now
This commit is contained in:
Andre Susano Pinto
2008-07-15 12:54:57 +00:00
parent 785123cc5a
commit afc30d1a33
28 changed files with 1457 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
source/gameengine/GameLogic/SCA_PythonController.cpp
View File

@@ -116,7 +116,7 @@ CValue* SCA_PythonController::GetReplica()
void SCA_PythonController::SetScriptText(const STR_String& text)
{
m_scriptText = "import GameLogic\n" + text;
m_scriptText = text;
m_bModified = true;
}
@@ -354,8 +354,10 @@ SCA_PythonController::PyGetSensor(PyObject* self, PyObject* value)
return sensor->AddRef();
}
}
PyErr_SetString(PyExc_AttributeError, "Unable to find requested sensor");
char emsg[96];
PyOS_snprintf( emsg, sizeof( emsg ), "Unable to find requested sensor \"%s\"", scriptArg );
PyErr_SetString(PyExc_AttributeError, emsg);
return NULL;
}
@@ -382,8 +384,10 @@ SCA_PythonController::PyGetActuator(PyObject* self, PyObject* value)
return actua->AddRef();
}
}
PyErr_SetString(PyExc_AttributeError, "Unable to find requested actuator");
char emsg[96];
PyOS_snprintf( emsg, sizeof( emsg ), "Unable to find requested actuator \"%s\"", scriptArg );
PyErr_SetString(PyExc_AttributeError, emsg);
return NULL;
}