forked from bartvdbraak/blender
These updates enable the build of the gameengine
(configure --enable-gameengine). However, you still need to manually configure, compile and install ode. * Following the original NaN makefile, I removed the TerraplayNetwork files from the build. (Moved the two files to EXTRA_DIST). * Pass a const char * to Py_BuildValue instead of a STR_String in BL_ActionActuator.cpp * Added some include directories in Makefile.am's Michel
This commit is contained in:
parent
1af0e07f74
commit
0a51feab36
@ -126,7 +126,7 @@ bool BL_ActionActuator::Update(double curtime,double deltatime)
|
|||||||
/* We know that action actuators have been discarded from all non armature objects:
|
/* We know that action actuators have been discarded from all non armature objects:
|
||||||
if we're being called, we're attached to a BL_ArmatureObject */
|
if we're being called, we're attached to a BL_ArmatureObject */
|
||||||
BL_ArmatureObject *obj = (BL_ArmatureObject*)GetParent();
|
BL_ArmatureObject *obj = (BL_ArmatureObject*)GetParent();
|
||||||
int length = m_endtime - m_starttime;
|
float length = m_endtime - m_starttime;
|
||||||
|
|
||||||
priority = m_priority;
|
priority = m_priority;
|
||||||
|
|
||||||
@ -436,7 +436,7 @@ PyObject* BL_ActionActuator::PyGetProperty(PyObject* self,
|
|||||||
PyObject* kwds) {
|
PyObject* kwds) {
|
||||||
PyObject *result;
|
PyObject *result;
|
||||||
|
|
||||||
result = Py_BuildValue("s", m_propname);
|
result = Py_BuildValue("s", (const char *)m_propname);
|
||||||
|
|
||||||
return result;
|
return result;
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user