forked from bartvdbraak/blender
bugfix [#20417] <memory> shouldn't be stored in recent item list
This commit is contained in:
parent
ec48cbd267
commit
dde838ec5e
@ -304,8 +304,9 @@ static void setup_app_data(bContext *C, BlendFileData *bfd, char *filename)
|
||||
if(G.main->versionfile < 250)
|
||||
do_versions_ipos_to_animato(G.main); // XXX fixme... complicated versionpatching
|
||||
|
||||
/* in case of autosave or quit.blend, use original filename instead */
|
||||
if(recover && bfd->filename[0])
|
||||
/* in case of autosave or quit.blend, use original filename instead
|
||||
* use relbase_valid to make sure the file is saved, else we get <memory2> in the filename */
|
||||
if(recover && bfd->filename[0] && G.relbase_valid)
|
||||
filename= bfd->filename;
|
||||
|
||||
/* these are the same at times, should never copy to the same location */
|
||||
|
@ -1233,8 +1233,6 @@ static PyObject *Matrix_getMedianScale( MatrixObject * self, void *type )
|
||||
|
||||
static PyObject *Matrix_getIsNegative( MatrixObject * self, void *type )
|
||||
{
|
||||
float vec[3];
|
||||
|
||||
if(!BaseMath_ReadCallback(self))
|
||||
return NULL;
|
||||
|
||||
@ -1257,7 +1255,7 @@ static PyGetSetDef Matrix_getseters[] = {
|
||||
{"row_size", (getter)Matrix_getRowSize, (setter)NULL, "The row size of the matrix (readonly). **type** int", NULL},
|
||||
{"col_size", (getter)Matrix_getColSize, (setter)NULL, "The column size of the matrix (readonly). **type** int", NULL},
|
||||
{"median_scale", (getter)Matrix_getMedianScale, (setter)NULL, "The average scale applied to each axis (readonly). **type** float", NULL},
|
||||
{"is_negative", (getter)Matrix_getIsNegative, (setter)NULL, "True if this matrix results in a negative scale, (3x3, 4x4 only) (readonly). **type** bool", NULL},
|
||||
{"is_negative", (getter)Matrix_getIsNegative, (setter)NULL, "True if this matrix results in a negative scale, 3x3 and 4x4 only, (readonly). **type** bool", NULL},
|
||||
{"is_wrapped", (getter)BaseMathObject_getWrapped, (setter)NULL, BaseMathObject_Wrapped_doc, NULL},
|
||||
{"_owner",(getter)BaseMathObject_getOwner, (setter)NULL, BaseMathObject_Owner_doc, NULL},
|
||||
{NULL,NULL,NULL,NULL,NULL} /* Sentinel */
|
||||
|
Loading…
Reference in New Issue
Block a user