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:
@@ -50,7 +50,7 @@ http://www.gnu.org/copyleft/lesser.txt.
|
||||
|
||||
// macro for exception handling and logging
|
||||
#define CATCH_EXCP catch (Exception & exp) \
|
||||
{ exp.report(); }
|
||||
{ exp.report(); return NULL; }
|
||||
|
||||
|
||||
// Blender GameObject type
|
||||
@@ -162,11 +162,12 @@ void Texture_dealloc (Texture * self)
|
||||
// release renderer
|
||||
Py_XDECREF(self->m_source);
|
||||
// close texture
|
||||
Texture_close(self);
|
||||
PyObject* ret = Texture_close(self);
|
||||
Py_DECREF(ret);
|
||||
// release scaled image buffer
|
||||
delete [] self->m_scaledImg;
|
||||
// release object
|
||||
self->ob_type->tp_free((PyObject*)self);
|
||||
((PyObject *)self)->ob_type->tp_free((PyObject*)self);
|
||||
}
|
||||
|
||||
|
||||
@@ -278,7 +279,7 @@ PyObject * Texture_refresh (Texture * self, PyObject * args)
|
||||
{
|
||||
// get parameter - refresh source
|
||||
PyObject * param;
|
||||
if (!PyArg_ParseTuple(args, "O", ¶m) || !PyBool_Check(param))
|
||||
if (!PyArg_ParseTuple(args, "O:refresh", ¶m) || !PyBool_Check(param))
|
||||
{
|
||||
// report error
|
||||
PyErr_SetString(PyExc_TypeError, "The value must be a bool");
|
||||
@@ -433,8 +434,13 @@ static PyGetSetDef textureGetSets[] =
|
||||
// class Texture declaration
|
||||
PyTypeObject TextureType =
|
||||
{
|
||||
PyObject_HEAD_INIT(NULL)
|
||||
#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
|
||||
"VideoTexture.Texture", /*tp_name*/
|
||||
sizeof(Texture), /*tp_basicsize*/
|
||||
0, /*tp_itemsize*/
|
||||
|
||||
Reference in New Issue
Block a user